From 5b44714f4cbd75138519789f55fd8b6f4b5d4241 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Tue, 13 Nov 2012 15:11:02 +0100 Subject: first version of the new previewer lib. It currently only created previews/thumbnails for images. It get´s more interesting when we add PDFs, movies, mp3, text files and more... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/preview.php | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/public/preview.php | 50 +++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100755 lib/preview.php create mode 100644 lib/public/preview.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php new file mode 100755 index 00000000000..8b1a42925a6 --- /dev/null +++ b/lib/preview.php @@ -0,0 +1,131 @@ +show(); + }else{ + header('Content-type: image/png'); + OC_PreviewUnknown::getThumbnail($maxX,$maxY); + } + } + + +} + + + +class OC_PreviewImage { + + // the thumbnail cache folder + const THUMBNAILS_FOLDER = 'thumbnails'; + + public static function getThumbnail($path,$maxX,$maxY,$scalingup) { + $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.self::THUMBNAILS_FOLDER); + + // is a preview already in the cache? + if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { + return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); + } + + // does the sourcefile exist? + if (!\OC_Filesystem::file_exists($path)) { + \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); + return false; + } + + // open the source image + $image = new \OC_Image(); + $image->loadFromFile(\OC_Filesystem::getLocalFile($path)); + if (!$image->valid()) return false; + + // fix the orientation + $image->fixOrientation(); + + // calculate the right preview size + $Xsize=$image->width(); + $Ysize=$image->height(); + if (($Xsize/$Ysize)>($maxX/$maxY)) { + $factor=$maxX/$Xsize; + } else { + $factor=$maxY/$Ysize; + } + + // only scale up if requested + if($scalingup==false) { + if($factor>1) $factor=1; + } + $newXsize=$Xsize*$factor; + $newYsize=$Ysize*$factor; + + // resize + $ret = $image->preciseResize($newXsize, $newYsize); + if (!$ret) { + \OC_Log::write('Preview', 'Couldn\'t resize image', \OC_Log::ERROR); + unset($image); + return false; + } + + // store in cache + $l = $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); + $image->save($l); + + return $image; + } + + + +} + + +class OC_PreviewUnknown { + public static function getThumbnail($maxX,$maxY) { + + // check if GD is installed + if(!extension_loaded('gd') || !function_exists('gd_info')) { + OC_Log::write('preview', __METHOD__.'(): GD module not installed', OC_Log::ERROR); + return false; + } + + // create a white image + $image = imagecreatetruecolor($maxX, $maxY); + $color = imagecolorallocate($image, 255, 255, 255); + imagefill($image, 0, 0, $color); + + // output the image + imagepng($image); + imagedestroy($image); + } + +} + diff --git a/lib/public/preview.php b/lib/public/preview.php new file mode 100644 index 00000000000..a7487c485f1 --- /dev/null +++ b/lib/public/preview.php @@ -0,0 +1,50 @@ +. +* +*/ + +/** + * Public interface of ownCloud for apps to use. + * Preview Class. + * + */ + +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP; + +/** + * This class provides functions to render and show thumbnails and previews of files + */ +class Preview { + + /** + * @brief return a preview of a file + * @param $file The path to the file where you want a thumbnail from + * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image + * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly + * @return image + */ + public static function show($file,$maxX=100,$maxY=75,$scaleup=false) { + return(\OC_Preview::show($file,$maxX,$maxY,$scaleup)); + } + +} -- cgit v1.2.3 From e484811e24f6332df49eb35c7e2adffca81d2005 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Tue, 13 Nov 2012 16:14:16 +0100 Subject: add some documentation, remove a debug hack, move folder name definition to main class --- lib/preview.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 8b1a42925a6..3fa494a2e03 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -19,21 +19,28 @@ TODO: class OC_Preview { - + + // the thumbnail cache folder + const THUMBNAILS_FOLDER = 'thumbnails'; /** * @brief return a preview of a file * @param $file The path to the file where you want a thumbnail from * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return image */ - static public function show($file,$maxX,$maxY) { + static public function show($file,$maxX,$maxY,$scalingup) { + // get the mimetype of the file $mimetype=explode('/',OC_FileSystem::getMimeType($file)); - if($mimetype[0]=='imaage'){ + + // it´s an image + if($mimetype[0]=='image'){ OCP\Response::enableCaching(3600 * 24); // 24 hour - $image=OC_PreviewImage::getThumbnail($file,$maxX,$maxY,false); + $image=OC_PreviewImage::getThumbnail($file,$maxX,$maxY,$scalingup); $image->show(); + // it´s something else. Let´s create a dummy preview }else{ header('Content-type: image/png'); OC_PreviewUnknown::getThumbnail($maxX,$maxY); @@ -47,11 +54,8 @@ class OC_Preview { class OC_PreviewImage { - // the thumbnail cache folder - const THUMBNAILS_FOLDER = 'thumbnails'; - public static function getThumbnail($path,$maxX,$maxY,$scalingup) { - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.self::THUMBNAILS_FOLDER); + $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); // is a preview already in the cache? if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { -- cgit v1.2.3 From eb27c0b2a84da44f8e42f7e4aca0102c969eb195 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Mon, 14 Jan 2013 15:51:47 +0100 Subject: snapshor of the preview lib. movies are not yet working --- lib/preview.php | 94 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 3fa494a2e03..d49e9d3bde3 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -9,6 +9,7 @@ /* TODO: - delete thumbnails if files change. + - make it work with external filesystem files. - movies support - pdf support - mp3/id3 support @@ -34,12 +35,17 @@ class OC_Preview { static public function show($file,$maxX,$maxY,$scalingup) { // get the mimetype of the file $mimetype=explode('/',OC_FileSystem::getMimeType($file)); - // it´s an image if($mimetype[0]=='image'){ OCP\Response::enableCaching(3600 * 24); // 24 hour $image=OC_PreviewImage::getThumbnail($file,$maxX,$maxY,$scalingup); $image->show(); + + // it´s a video + }elseif($mimetype[0]=='video'){ + OCP\Response::enableCaching(3600 * 24); // 24 hour + OC_PreviewMovie::getThumbnail($file,$maxX,$maxY,$scalingup); + // it´s something else. Let´s create a dummy preview }else{ header('Content-type: image/png'); @@ -55,56 +61,59 @@ class OC_Preview { class OC_PreviewImage { public static function getThumbnail($path,$maxX,$maxY,$scalingup) { - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); - // is a preview already in the cache? + $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); + + // is a preview already in the cache? if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); } - - // does the sourcefile exist? + + // does the sourcefile exist? if (!\OC_Filesystem::file_exists($path)) { \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); return false; } - // open the source image + // open the source image $image = new \OC_Image(); $image->loadFromFile(\OC_Filesystem::getLocalFile($path)); if (!$image->valid()) return false; - // fix the orientation + // fix the orientation $image->fixOrientation(); - - // calculate the right preview size - $Xsize=$image->width(); - $Ysize=$image->height(); - if (($Xsize/$Ysize)>($maxX/$maxY)) { - $factor=$maxX/$Xsize; - } else { - $factor=$maxY/$Ysize; - } - - // only scale up if requested - if($scalingup==false) { - if($factor>1) $factor=1; - } - $newXsize=$Xsize*$factor; - $newYsize=$Ysize*$factor; - // resize + // calculate the right preview size + $Xsize=$image->width(); + $Ysize=$image->height(); + if (($Xsize/$Ysize)>($maxX/$maxY)) { + $factor=$maxX/$Xsize; + } else { + $factor=$maxY/$Ysize; + } + + // only scale up if requested + if($scalingup==false) { + if($factor>1) $factor=1; + } + $newXsize=$Xsize*$factor; + $newYsize=$Ysize*$factor; + + // resize $ret = $image->preciseResize($newXsize, $newYsize); if (!$ret) { \OC_Log::write('Preview', 'Couldn\'t resize image', \OC_Log::ERROR); unset($image); return false; } - - // store in cache + + // store in cache $l = $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); $image->save($l); return $image; + + } @@ -112,6 +121,39 @@ class OC_PreviewImage { } +class OC_PreviewMovie { + + public static function isAvailable() { + $check=shell_exec('ffmpeg'); + if($check==NULL) return(false); else return(true); + } + + public static function getThumbnail($path,$maxX,$maxY,$scalingup) { + $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); + + // is a preview already in the cache? + if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { + return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); + } + + // does the sourcefile exist? + if (!\OC_Filesystem::file_exists($path)) { + \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); + return false; + } + + // call ffmpeg to do the screenshot + shell_exec('ffmpeg -y -i {'.escapeshellarg($path).'} -f mjpeg -vframes 1 -ss 1 -s {'.escapeshellarg($maxX).'}x{'.escapeshellarg($maxY).'} {.'.$thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup).'}'); + + // output the generated Preview + $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); + unset($thumbnails_view); + } + + +} + + class OC_PreviewUnknown { public static function getThumbnail($maxX,$maxY) { -- cgit v1.2.3 From 9ef449842a369c2517f5c34932b502b754393ce0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 25 Apr 2013 11:18:45 +0200 Subject: save current work state of Preview Lib --- lib/preview.php | 378 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 149 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index d49e9d3bde3..c7047633212 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -1,28 +1,139 @@ getFileInfo($file); + $fileid = self::$fileinfo['fileid']; + + //echo self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid; + if(!self::$fileview->is_dir(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid)){ + return false; + } + + //does a preview with the wanted height and width already exist? + if(self::$fileview->file_exists(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png')){ + return self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png'; + } + + $wantedaspectratio = $maxX / $maxY; + + //array for usable cached thumbnails + $possiblethumbnails = array(); + + $allthumbnails = self::$fileview->getDirectoryContent(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid); + foreach($allthumbnails as $thumbnail){ + $size = explode('-', $thumbnail['name']); + $x = $size[0]; + $y = $size[1]; + + $aspectratio = $x / $y; + if($aspectratio != $wantedaspectratio){ + continue; + } + + if($x < $maxX || $y < $maxY){ + if($scalingup){ + $scalefactor = $maxX / $x; + if($scalefactor > self::MAX_SCALE_FACTOR){ + continue; + } + }else{ + continue; + } + } + + $possiblethumbnails[$x] = $thumbnail['path']; + } + + if(count($possiblethumbnails) === 0){ + return false; + } + + if(count($possiblethumbnails) === 1){ + return current($possiblethumbnails); + } + + ksort($possiblethumbnails); + + if(key(reset($possiblethumbnails)) > $maxX){ + return current(reset($possiblethumbnails)); + } + + if(key(end($possiblethumbnails)) < $maxX){ + return current(end($possiblethumbnails)); + } + + foreach($possiblethumbnails as $width => $path){ + if($width < $maxX){ + continue; + }else{ + return $path; + } + } + } - // the thumbnail cache folder - const THUMBNAILS_FOLDER = 'thumbnails'; + /** + * @brief delete a preview with a specfic height and width + * @param $file path to the file + * @param $x width of preview + * @param $y height of preview + * @return image + */ + public static function deletePreview($file, $x, $y){ + self::init(); + + $fileinfo = self::$fileview->getFileInfo($file); + $fileid = self::$fileinfo['fileid']; + + return self::$fileview->unlink(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png'); + } + + /** + * @brief deletes all previews of a file + * @param $file path of file + * @return bool + */ + public static function deleteAllPrevies($file){ + self::init(); + + $fileinfo = self::$fileview->getFileInfo($file); + $fileid = self::$fileinfo['fileid']; + + return self::$fielview->rmdir(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid); + } /** * @brief return a preview of a file @@ -32,146 +143,115 @@ class OC_Preview { * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return image */ - static public function show($file,$maxX,$maxY,$scalingup) { - // get the mimetype of the file - $mimetype=explode('/',OC_FileSystem::getMimeType($file)); - // it´s an image - if($mimetype[0]=='image'){ - OCP\Response::enableCaching(3600 * 24); // 24 hour - $image=OC_PreviewImage::getThumbnail($file,$maxX,$maxY,$scalingup); - $image->show(); - - // it´s a video - }elseif($mimetype[0]=='video'){ - OCP\Response::enableCaching(3600 * 24); // 24 hour - OC_PreviewMovie::getThumbnail($file,$maxX,$maxY,$scalingup); - - // it´s something else. Let´s create a dummy preview - }else{ - header('Content-type: image/png'); - OC_PreviewUnknown::getThumbnail($maxX,$maxY); + public static function getPreview($file, $maxX, $maxY, $scalingup){ + self::init(); + + $cached = self::isCached($file, $maxX, $maxY); + if($cached){ + $image = new \OC_Image($cached); + if($image->width() != $maxX && $image->height != $maxY){ + $image->preciseResize($maxX, $maxY); + } + return $image; } + + $mimetype = self::$fileview->getMimeType($file); + + $preview; + + foreach(self::$providers as $supportedmimetype => $provider){ + if(!preg_match($supportedmimetype, $mimetype)){ + continue; + } + + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup); + + if(!$preview){ + continue; + } + + if(!($preview instanceof \OC_Image)){ + $preview = @new \OC_Image($preview); + } + + //cache thumbnail + $preview->save(self::$filesview->getAbsolutePath(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png')); + + break; + } + + return $preview; } + /** + * @brief return a preview of a file + * @param $file The path to the file where you want a thumbnail from + * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image + * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly + * @return image + */ + public static function showPreview($file, $maxX, $maxY, $scalingup = true, $fontsize = 12){ + OCP\Response::enableCaching(3600 * 24); // 24 hour + $preview = self::getPreview($file, $maxX, $maxY, $scalingup, $fontsize); + $preview->show(); + } + + /** + * @brief check whether or not providers and views are initialized and initialize if not + * @return void + */ + private static function init(){ + if(empty(self::$providers)){ + self::initProviders(); + } + if(is_null(self::$thumbnailsview) || is_null(self::$userlandview)){ + self::initViews(); + } + } -} - - - -class OC_PreviewImage { - - public static function getThumbnail($path,$maxX,$maxY,$scalingup) { - - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); - - // is a preview already in the cache? - if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { - return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); - } - - // does the sourcefile exist? - if (!\OC_Filesystem::file_exists($path)) { - \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); - return false; - } - - // open the source image - $image = new \OC_Image(); - $image->loadFromFile(\OC_Filesystem::getLocalFile($path)); - if (!$image->valid()) return false; - - // fix the orientation - $image->fixOrientation(); - - // calculate the right preview size - $Xsize=$image->width(); - $Ysize=$image->height(); - if (($Xsize/$Ysize)>($maxX/$maxY)) { - $factor=$maxX/$Xsize; - } else { - $factor=$maxY/$Ysize; - } - - // only scale up if requested - if($scalingup==false) { - if($factor>1) $factor=1; - } - $newXsize=$Xsize*$factor; - $newYsize=$Ysize*$factor; - - // resize - $ret = $image->preciseResize($newXsize, $newYsize); - if (!$ret) { - \OC_Log::write('Preview', 'Couldn\'t resize image', \OC_Log::ERROR); - unset($image); - return false; - } - - // store in cache - $l = $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); - $image->save($l); - - return $image; - - - } - - - -} - - -class OC_PreviewMovie { - - public static function isAvailable() { - $check=shell_exec('ffmpeg'); - if($check==NULL) return(false); else return(true); - } - - public static function getThumbnail($path,$maxX,$maxY,$scalingup) { - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); - - // is a preview already in the cache? - if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { - return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); - } - - // does the sourcefile exist? - if (!\OC_Filesystem::file_exists($path)) { - \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); - return false; - } - - // call ffmpeg to do the screenshot - shell_exec('ffmpeg -y -i {'.escapeshellarg($path).'} -f mjpeg -vframes 1 -ss 1 -s {'.escapeshellarg($maxX).'}x{'.escapeshellarg($maxY).'} {.'.$thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup).'}'); - - // output the generated Preview - $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); - unset($thumbnails_view); - } - - -} - + /** + * @brief register a new preview provider to be used + * @param string $provider class name of a OC_Preview_Provider + * @return void + */ + public static function registerProvider($class, $options=array()){ + self::$registeredProviders[]=array('class'=>$class, 'options'=>$options); + } -class OC_PreviewUnknown { - public static function getThumbnail($maxX,$maxY) { + /** + * @brief create instances of all the registered preview providers + * @return void + */ + private static function initProviders(){ + if(count(self::$providers)>0) { + return; + } + + foreach(self::$registeredProviders as $provider) { + $class=$provider['class']; + $options=$provider['options']; - // check if GD is installed - if(!extension_loaded('gd') || !function_exists('gd_info')) { - OC_Log::write('preview', __METHOD__.'(): GD module not installed', OC_Log::ERROR); - return false; + $object = new $class($options); + + self::$providers[$object->getMimeType()] = $object; } - - // create a white image - $image = imagecreatetruecolor($maxX, $maxY); - $color = imagecolorallocate($image, 255, 255, 255); - imagefill($image, 0, 0, $color); - - // output the image - imagepng($image); - imagedestroy($image); - } - -} - + + $keys = array_map('strlen', array_keys(self::$providers)); + array_multisort($keys, SORT_DESC, self::$providers); + } + + /** + * @brief initialize a new \OC\Files\View object + * @return void + */ + private static function initViews(){ + if(is_null(self::$fileview)){ + self::$fileview = new OC\Files\View(); + } + } + + public static function previewRouter($params){ + var_dump($params); + } +} \ No newline at end of file -- cgit v1.2.3 From 8c1925425b26d9b2889632c724ec455ceeed4dd4 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 25 Apr 2013 12:51:44 +0200 Subject: save current work state --- lib/preview.php | 32 ++++++++++++++++++++-- lib/preview/images.php | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/preview/movies.php | 42 ++++++++++++++++++++++++++++ lib/preview/mp3.php | 1 + lib/preview/pdf.php | 0 lib/preview/provider.php | 20 ++++++++++++++ lib/preview/unknown.php | 34 +++++++++++++++++++++++ 7 files changed, 197 insertions(+), 3 deletions(-) create mode 100644 lib/preview/images.php create mode 100644 lib/preview/movies.php create mode 100644 lib/preview/mp3.php create mode 100644 lib/preview/pdf.php create mode 100644 lib/preview/provider.php create mode 100644 lib/preview/unknown.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index c7047633212..de79b424077 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -205,7 +205,7 @@ class OC_Preview { if(empty(self::$providers)){ self::initProviders(); } - if(is_null(self::$thumbnailsview) || is_null(self::$userlandview)){ + if(is_null(self::$fileview)){ self::initViews(); } } @@ -247,11 +247,37 @@ class OC_Preview { */ private static function initViews(){ if(is_null(self::$fileview)){ - self::$fileview = new OC\Files\View(); + //does this work with LDAP? + self::$fileview = new OC\Files\View(OC_User::getUser()); } } public static function previewRouter($params){ - var_dump($params); + self::init(); + + $file = (string) urldecode($_GET['file']); + $maxX = (int) $_GET['x']; + $maxY = (int) $_GET['y']; + $scalingup = (bool) $_GET['scalingup']; + + $path = 'files/' . $file; + + if($maxX === 0 || $maxY === 0){ + OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::DEBUG); + exit; + } + + var_dump(self::$fileview->file_exists($path)); + var_dump(self::$fileview->getDirectoryContent()); + var_dump(self::$fileview->getDirectoryContent('files/')); + var_dump($path); + var_dump(self::$fileview->filesize($path)); + var_dump(self::$fileview->getAbsolutePath('/')); + + if(!self::$fileview->filesize($path)){ + OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); + } + + self::showPreview($file, $maxX, $maxY, $scalingup); } } \ No newline at end of file diff --git a/lib/preview/images.php b/lib/preview/images.php new file mode 100644 index 00000000000..6b6e8e3599f --- /dev/null +++ b/lib/preview/images.php @@ -0,0 +1,71 @@ +file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { + return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); + } + + // does the sourcefile exist? + if (!\OC_Filesystem::file_exists($path)) { + \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); + return false; + } + + // open the source image + $image = new \OC_Image(); + $image->loadFromFile(\OC_Filesystem::getLocalFile($path)); + if (!$image->valid()) return false; + + // fix the orientation + $image->fixOrientation(); + + // calculate the right preview size + $Xsize=$image->width(); + $Ysize=$image->height(); + if (($Xsize/$Ysize)>($maxX/$maxY)) { + $factor=$maxX/$Xsize; + } else { + $factor=$maxY/$Ysize; + } + + // only scale up if requested + if($scalingup==false) { + if($factor>1) $factor=1; + } + $newXsize=$Xsize*$factor; + $newYsize=$Ysize*$factor; + + // resize + $ret = $image->preciseResize($newXsize, $newYsize); + if (!$ret) { + \OC_Log::write('Preview', 'Couldn\'t resize image', \OC_Log::ERROR); + unset($image); + return false; + } + + // store in cache + $l = $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); + $image->save($l); + + return $image; + } + +} + +OC_Preview::registerProvider('OC_Preview_Image'); \ No newline at end of file diff --git a/lib/preview/movies.php b/lib/preview/movies.php new file mode 100644 index 00000000000..afa27c0b143 --- /dev/null +++ b/lib/preview/movies.php @@ -0,0 +1,42 @@ +file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { + return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); + } + + // does the sourcefile exist? + if (!\OC_Filesystem::file_exists($path)) { + \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); + return false; + } + + // call ffmpeg to do the screenshot + shell_exec('ffmpeg -y -i {'.escapeshellarg($path).'} -f mjpeg -vframes 1 -ss 1 -s {'.escapeshellarg($maxX).'}x{'.escapeshellarg($maxY).'} {.'.$thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup).'}'); + + // output the generated Preview + $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); + unset($thumbnails_view); + } + + } + + OC_Preview::registerProvider('OC_Preview_Movie'); +} \ No newline at end of file diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php new file mode 100644 index 00000000000..645e6fa6232 --- /dev/null +++ b/lib/preview/mp3.php @@ -0,0 +1 @@ +///audio\/mpeg/ \ No newline at end of file diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/preview/provider.php b/lib/preview/provider.php new file mode 100644 index 00000000000..c45edbba44d --- /dev/null +++ b/lib/preview/provider.php @@ -0,0 +1,20 @@ +options=$options; + } + + abstract public function getMimeType(); + + /** + * search for $query + * @param string $query + * @return + */ + abstract public function getThumbnail($path, $maxX, $maxY, $scalingup); +} diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php new file mode 100644 index 00000000000..1cd270db687 --- /dev/null +++ b/lib/preview/unknown.php @@ -0,0 +1,34 @@ + Date: Thu, 9 May 2013 23:59:16 +0200 Subject: implement OC_Preview --- lib/preview.php | 517 +++++++++++++++++++++++++++++++++++------------ lib/preview/images.php | 53 +---- lib/preview/movies.php | 4 +- lib/preview/mp3.php | 21 +- lib/preview/pdf.php | 29 +++ lib/preview/provider.php | 2 +- lib/preview/unknown.php | 2 +- 7 files changed, 446 insertions(+), 182 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index de79b424077..c062a068872 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -5,21 +5,38 @@ * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. - */ -/* + * * Thumbnails: * structure of filename: * /data/user/thumbnails/pathhash/x-y.png * */ +require_once('preview/images.php'); +require_once('preview/movies.php'); +require_once('preview/mp3.php'); +require_once('preview/pdf.php'); +require_once('preview/unknown.php'); class OC_Preview { //the thumbnail folder const THUMBNAILS_FOLDER = 'thumbnails'; - const MAX_SCALE_FACTOR = 2; + + //config + private $max_scale_factor; + private $max_x; + private $max_y; //fileview object - static private $fileview = null; + private $fileview = null; + private $userview = null; + + //vars + private $file; + private $maxX; + private $maxY; + private $scalingup; + + private $preview; //preview providers static private $providers = array(); @@ -27,6 +44,8 @@ class OC_Preview { /** * @brief check if thumbnail or bigger version of thumbnail of file is cached + * @param $user userid + * @param $root path of root * @param $file The path to the file where you want a thumbnail from * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image @@ -34,68 +53,223 @@ class OC_Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - private static function isCached($file, $maxX, $maxY, $scalingup){ - $fileinfo = self::$fileview->getFileInfo($file); - $fileid = self::$fileinfo['fileid']; + public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = false){ + //set config + $this->max_x = OC_Config::getValue('preview_max_x', null); + $this->max_y = OC_Config::getValue('preview_max_y', null); + $this->max_scale_factor = OC_Config::getValue('preview_max_scale_factor', 10); - //echo self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid; - if(!self::$fileview->is_dir(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid)){ - return false; + //save parameters + $this->file = $file; + $this->maxX = $maxX; + $this->maxY = $maxY; + $this->scalingup = $scalingup; + + //init fileviews + $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); + $this->userview = new \OC\Files\View('/' . $user); + + if(!is_null($this->max_x)){ + if($this->maxX > $this->max_x){ + OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG); + $this->maxX = $this->max_x; + } + } + + if(!is_null($this->max_y)){ + if($this->maxY > $this->max_y){ + OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG); + $this->maxY = $this->max_y; + } + } + + //init providers + if(empty(self::$providers)){ + self::initProviders(); + } + + //check if there are any providers at all + if(empty(self::$providers)){ + OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR); + throw new Exception('No providers'); + } + + //validate parameters + if($file === ''){ + OC_Log::write('core', 'No filename passed', OC_Log::ERROR); + throw new Exception('File not found'); } + + //check if file exists + if(!$this->fileview->file_exists($file)){ + OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR); + throw new Exception('File not found'); + } + + //check if given size makes sense + if($maxX === 0 || $maxY === 0){ + OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR); + throw new Exception('Height and/or width set to 0'); + } + } + + /** + * @brief returns the path of the file you want a thumbnail from + * @return string + */ + public function getFile(){ + return $this->file; + } + + /** + * @brief returns the max width of the preview + * @return integer + */ + public function getMaxX(){ + return $this->maxX; + } + + /** + * @brief returns the max height of the preview + * @return integer + */ + public function getMaxY(){ + return $this->maxY; + } + + /** + * @brief returns whether or not scalingup is enabled + * @return bool + */ + public function getScalingup(){ + return $this->scalingup; + } + + /** + * @brief returns the name of the thumbnailfolder + * @return string + */ + public function getThumbnailsfolder(){ + return self::THUMBNAILS_FOLDER; + } + + /** + * @brief returns the max scale factor + * @return integer + */ + public function getMaxScaleFactor(){ + return $this->max_scale_factor; + } + + /** + * @brief returns the max width set in ownCloud's config + * @return integer + */ + public function getConfigMaxX(){ + return $this->max_x; + } + + /** + * @brief returns the max height set in ownCloud's config + * @return integer + */ + public function getConfigMaxY(){ + return $this->max_y; + } + + /** + * @brief deletes previews of a file with specific x and y + * @return bool + */ + public function deletePreview(){ + $fileinfo = $this->fileview->getFileInfo($this->file); + $fileid = $fileinfo['fileid']; + return $this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png'); + } + + /** + * @brief deletes all previews of a file + * @return bool + */ + public function deleteAllPrevies(){ + $fileinfo = $this->fileview->getFileInfo($this->file); + $fileid = $fileinfo['fileid']; + + return $this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid); + } + + /** + * @brief check if thumbnail or bigger version of thumbnail of file is cached + * @return mixed (bool / string) + * false if thumbnail does not exist + * path to thumbnail if thumbnail exists + */ + private function isCached(){ + $file = $this->file; + $maxX = $this->maxX; + $maxY = $this->maxY; + $scalingup = $this->scalingup; + + $fileinfo = $this->fileview->getFileInfo($file); + $fileid = $fileinfo['fileid']; + + if(!$this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid)){ + return false; + } + //does a preview with the wanted height and width already exist? - if(self::$fileview->file_exists(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png')){ - return self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png'; + if($this->userview->file_exists(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')){ + return self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; } - + $wantedaspectratio = $maxX / $maxY; - + //array for usable cached thumbnails $possiblethumbnails = array(); - - $allthumbnails = self::$fileview->getDirectoryContent(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid); + + $allthumbnails = $this->userview->getDirectoryContent(self::THUMBNAILS_FOLDER . '/' . $fileid); foreach($allthumbnails as $thumbnail){ $size = explode('-', $thumbnail['name']); $x = $size[0]; $y = $size[1]; - + $aspectratio = $x / $y; if($aspectratio != $wantedaspectratio){ continue; } - + if($x < $maxX || $y < $maxY){ if($scalingup){ $scalefactor = $maxX / $x; - if($scalefactor > self::MAX_SCALE_FACTOR){ + if($scalefactor > $this->max_scale_factor){ continue; } }else{ continue; } } - $possiblethumbnails[$x] = $thumbnail['path']; } - + if(count($possiblethumbnails) === 0){ return false; } - + if(count($possiblethumbnails) === 1){ return current($possiblethumbnails); } - + ksort($possiblethumbnails); - + if(key(reset($possiblethumbnails)) > $maxX){ return current(reset($possiblethumbnails)); } - + if(key(end($possiblethumbnails)) < $maxX){ return current(end($possiblethumbnails)); } - + foreach($possiblethumbnails as $width => $path){ if($width < $maxX){ continue; @@ -106,33 +280,56 @@ class OC_Preview { } /** - * @brief delete a preview with a specfic height and width - * @param $file path to the file - * @param $x width of preview - * @param $y height of preview + * @brief return a preview of a file + * @param $file The path to the file where you want a thumbnail from + * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image + * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return image */ - public static function deletePreview($file, $x, $y){ - self::init(); - - $fileinfo = self::$fileview->getFileInfo($file); - $fileid = self::$fileinfo['fileid']; - - return self::$fileview->unlink(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png'); - } + public function getPreview(){ + $file = $this->file; + $maxX = $this->maxX; + $maxY = $this->maxY; + $scalingup = $this->scalingup; - /** - * @brief deletes all previews of a file - * @param $file path of file - * @return bool - */ - public static function deleteAllPrevies($file){ - self::init(); - - $fileinfo = self::$fileview->getFileInfo($file); - $fileid = self::$fileinfo['fileid']; - - return self::$fielview->rmdir(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid); + $fileinfo = $this->fileview->getFileInfo($file); + $fileid = $fileinfo['fileid']; + + $cached = self::isCached(); + + if($cached){ + $image = new \OC_Image($this->userview->getLocalFile($cached)); + $this->preview = $image; + }else{ + $mimetype = $this->fileview->getMimeType($file); + + $preview; + + foreach(self::$providers as $supportedmimetype => $provider){ + if(!preg_match($supportedmimetype, $mimetype)){ + continue; + } + + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); + + if(!$preview){ + continue; + } + + if(!($preview instanceof \OC_Image)){ + $preview = @new \OC_Image($preview); + } + + //cache thumbnail + $preview->save($this->userview->getLocalFile(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')); + + break; + } + $this->preview = $preview; + } + $this->resizeAndCrop(); + return $this->preview; } /** @@ -141,72 +338,109 @@ class OC_Preview { * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly + * @return void + */ + public function showPreview(){ + OCP\Response::enableCaching(3600 * 24); // 24 hour + $preview = $this->getPreview(); + if($preview){ + $preview->show(); + } + } + + /** + * @brief resize, crop and fix orientation * @return image */ - public static function getPreview($file, $maxX, $maxY, $scalingup){ - self::init(); + public function resizeAndCrop(){ + $image = $this->preview; + $x = $this->maxX; + $y = $this->maxY; + $scalingup = $this->scalingup; + + $image->fixOrientation(); + + if(!($image instanceof \OC_Image)){ + OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', OC_Log::DEBUG); + return; + } + + $realx = (int) $image->width(); + $realy = (int) $image->height(); + + if($x === $realx && $y === $realy){ + return $image; + } + + $factorX = $x / $realx; + $factorY = $y / $realy; - $cached = self::isCached($file, $maxX, $maxY); - if($cached){ - $image = new \OC_Image($cached); - if($image->width() != $maxX && $image->height != $maxY){ - $image->preciseResize($maxX, $maxY); + if($factorX >= $factorY){ + $factor = $factorX; + }else{ + $factor = $factorY; + } + + // only scale up if requested + if($scalingup === false) { + if($factor>1) $factor=1; + } + if(!is_null($this->max_scale_factor)){ + if($factor > $this->max_scale_factor){ + OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $this->max_scale_factor, OC_Log::DEBUG); + $factor = $this->max_scale_factor; } - return $image; } + $newXsize = $realx * $factor; + $newYsize = $realy * $factor; + + // resize + $image->preciseResize($newXsize, $newYsize); - $mimetype = self::$fileview->getMimeType($file); + if($newXsize === $x && $newYsize === $y){ + $this->preview = $image; + return; + } - $preview; + if($newXsize >= $x && $newYsize >= $y){ + $cropX = floor(abs($x - $newXsize) * 0.5); + $cropY = floor(abs($y - $newYsize) * 0.5); + + $image->crop($cropX, $cropY, $x, $y); + + $this->preview = $image; + return; + } - foreach(self::$providers as $supportedmimetype => $provider){ - if(!preg_match($supportedmimetype, $mimetype)){ - continue; + if($newXsize < $x || $newYsize < $y){ + if($newXsize > $x){ + $cropX = floor(($newXsize - $x) * 0.5); + $image->crop($cropX, 0, $x, $newYsize); } - $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup); - - if(!$preview){ - continue; + if($newYsize > $y){ + $cropY = floor(($newYsize - $y) * 0.5); + $image->crop(0, $cropY, $newXsize, $y); } - if(!($preview instanceof \OC_Image)){ - $preview = @new \OC_Image($preview); - } + $newXsize = (int) $image->width(); + $newYsize = (int) $image->height(); - //cache thumbnail - $preview->save(self::$filesview->getAbsolutePath(self::THUMBNAILS_FOLDER . PATH_SEPARATOR . $fileid . PATH_SEPARATOR . $x . '-' . $y . '.png')); + //create transparent background layer + $transparentlayer = imagecreatetruecolor($x, $y); + $black = imagecolorallocate($transparentlayer, 0, 0, 0); + $image = $image->resource(); + imagecolortransparent($transparentlayer, $black); - break; - } - - return $preview; - } - - /** - * @brief return a preview of a file - * @param $file The path to the file where you want a thumbnail from - * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image - * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image - * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly - * @return image - */ - public static function showPreview($file, $maxX, $maxY, $scalingup = true, $fontsize = 12){ - OCP\Response::enableCaching(3600 * 24); // 24 hour - $preview = self::getPreview($file, $maxX, $maxY, $scalingup, $fontsize); - $preview->show(); - } - - /** - * @brief check whether or not providers and views are initialized and initialize if not - * @return void - */ - private static function init(){ - if(empty(self::$providers)){ - self::initProviders(); - } - if(is_null(self::$fileview)){ - self::initViews(); + $mergeX = floor(abs($x - $newXsize) * 0.5); + $mergeY = floor(abs($y - $newYsize) * 0.5); + + imagecopymerge($transparentlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize, 100); + + $image = new \OC_Image($transparentlayer); + + $this->preview = $image; + return; } } @@ -236,48 +470,75 @@ class OC_Preview { self::$providers[$object->getMimeType()] = $object; } - + $keys = array_map('strlen', array_keys(self::$providers)); array_multisort($keys, SORT_DESC, self::$providers); } /** - * @brief initialize a new \OC\Files\View object + * @brief method that handles preview requests from users that are logged in * @return void */ - private static function initViews(){ - if(is_null(self::$fileview)){ - //does this work with LDAP? - self::$fileview = new OC\Files\View(OC_User::getUser()); - } - } - public static function previewRouter($params){ - self::init(); + OC_Util::checkLoggedIn(); - $file = (string) urldecode($_GET['file']); - $maxX = (int) $_GET['x']; - $maxY = (int) $_GET['y']; - $scalingup = (bool) $_GET['scalingup']; + $file = ''; + $maxX = 0; + $maxY = 0; + /* + * use: ?scalingup=0 / ?scalingup = 1 + * do not use ?scalingup=false / ?scalingup = true as these will always be true + */ + $scalingup = false; - $path = 'files/' . $file; + if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); + if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; + if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; + if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - if($maxX === 0 || $maxY === 0){ - OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::DEBUG); + if($file !== '' && $maxX !== 0 && $maxY !== 0){ + $preview = new OC_Preview(OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); + $preview->showPreview(); + }else{ + OC_Response::setStatus(404); exit; } + } + + /** + * @brief method that handles preview requests from users that are not logged in / view shared folders that are public + * @return void + */ + public static function publicPreviewRouter($params){ + $file = ''; + $maxX = 0; + $maxY = 0; + $scalingup = false; + $token = ''; + + $user = null; + $path = null; - var_dump(self::$fileview->file_exists($path)); - var_dump(self::$fileview->getDirectoryContent()); - var_dump(self::$fileview->getDirectoryContent('files/')); - var_dump($path); - var_dump(self::$fileview->filesize($path)); - var_dump(self::$fileview->getAbsolutePath('/')); + if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); + if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; + if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; + if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; + if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - if(!self::$fileview->filesize($path)){ - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); + $linkItem = OCP\Share::getShareByToken($token); + if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { + $userid = $linkItem['uid_owner']; + OC_Util::setupFS($fileOwner); + $path = $linkItem['file_source']; + } + + if($user !== null && $path !== null){ + $preview = new OC_Preview($userid, $path, $file, $maxX, $maxY, $scalingup); + $preview->showPreview(); + }else{ + OC_Response::setStatus(404); + exit; } - self::showPreview($file, $maxX, $maxY, $scalingup); } } \ No newline at end of file diff --git a/lib/preview/images.php b/lib/preview/images.php index 6b6e8e3599f..6766cdb2148 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -12,60 +12,15 @@ class OC_Preview_Image extends OC_Preview_Provider{ return '/image\/.*/'; } - public static function getThumbnail($path,$maxX,$maxY,$scalingup) { - - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); - - // is a preview already in the cache? - if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { - return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); - } - - // does the sourcefile exist? - if (!\OC_Filesystem::file_exists($path)) { - \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); - return false; - } - - // open the source image + public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { + //new image object $image = new \OC_Image(); - $image->loadFromFile(\OC_Filesystem::getLocalFile($path)); + $image->loadFromFile($fileview->getLocalFile($path)); + //check if image object is valid if (!$image->valid()) return false; - // fix the orientation - $image->fixOrientation(); - - // calculate the right preview size - $Xsize=$image->width(); - $Ysize=$image->height(); - if (($Xsize/$Ysize)>($maxX/$maxY)) { - $factor=$maxX/$Xsize; - } else { - $factor=$maxY/$Ysize; - } - - // only scale up if requested - if($scalingup==false) { - if($factor>1) $factor=1; - } - $newXsize=$Xsize*$factor; - $newYsize=$Ysize*$factor; - - // resize - $ret = $image->preciseResize($newXsize, $newYsize); - if (!$ret) { - \OC_Log::write('Preview', 'Couldn\'t resize image', \OC_Log::ERROR); - unset($image); - return false; - } - - // store in cache - $l = $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); - $image->save($l); - return $image; } - } OC_Preview::registerProvider('OC_Preview_Image'); \ No newline at end of file diff --git a/lib/preview/movies.php b/lib/preview/movies.php index afa27c0b143..c994240424c 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -6,7 +6,7 @@ * later. * See the COPYING-README file. */ -if(!is_null(shell_exec('ffmpeg'))){ +if(!is_null(shell_exec('ffmpeg -version'))){ class OC_Preview_Movie extends OC_Preview_Provider{ @@ -14,7 +14,7 @@ if(!is_null(shell_exec('ffmpeg'))){ return '/video\/.*/'; } - public static function getThumbnail($path,$maxX,$maxY,$scalingup) { + public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); // is a preview already in the cache? diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 645e6fa6232..2481e743783 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -1 +1,20 @@ -///audio\/mpeg/ \ No newline at end of file +getLocalFile($path) . '[0]'); + $pdf->setImageFormat('png'); + + //new image object + $image = new \OC_Image(); + $image->loadFromFile($fileview->getLocalFile($path)); + //check if image object is valid + if (!$image->valid()) return false; + + return $image; + } +} + +OC_Preview::registerProvider('OC_Preview_PDF'); \ No newline at end of file diff --git a/lib/preview/provider.php b/lib/preview/provider.php index c45edbba44d..e9264030144 100644 --- a/lib/preview/provider.php +++ b/lib/preview/provider.php @@ -16,5 +16,5 @@ abstract class OC_Preview_Provider{ * @param string $query * @return */ - abstract public function getThumbnail($path, $maxX, $maxY, $scalingup); + abstract public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview); } diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 1cd270db687..5089a56d671 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -12,7 +12,7 @@ class OC_Preview_Unknown extends OC_Preview_Provider{ return '/.*/'; } - public static function getThumbnail($maxX,$maxY) { + public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { // check if GD is installed if(!extension_loaded('gd') || !function_exists('gd_info')) { OC_Log::write('preview', __METHOD__.'(): GD module not installed', OC_Log::ERROR); -- cgit v1.2.3 From 837c6ed597f1c549cac5b0b439b257d81ea02b1d Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 09:43:25 +0200 Subject: implement pdf preview backend --- lib/preview/pdf.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index d86ad643914..695f8569538 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -14,11 +14,10 @@ class OC_Preview_PDF extends OC_Preview_Provider{ public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { //create imagick object from pdf $pdf = new imagick($fileview->getLocalFile($path) . '[0]'); - $pdf->setImageFormat('png'); - + $pdf->setImageFormat('jpg'); + //new image object - $image = new \OC_Image(); - $image->loadFromFile($fileview->getLocalFile($path)); + $image = new \OC_Image($pdf); //check if image object is valid if (!$image->valid()) return false; -- cgit v1.2.3 From 8dba46912d19bf976b24e0c097368f2e56ccb97b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 11:28:49 +0200 Subject: Disable transparent backgrounds for now --- lib/preview.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index c062a068872..44b551006f1 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -427,17 +427,21 @@ class OC_Preview { $newYsize = (int) $image->height(); //create transparent background layer - $transparentlayer = imagecreatetruecolor($x, $y); - $black = imagecolorallocate($transparentlayer, 0, 0, 0); + $backgroundlayer = imagecreatetruecolor($x, $y); + $white = imagecolorallocate($backgroundlayer, 255, 255, 255); + imagefill($backgroundlayer, 0, 0, $white); + $image = $image->resource(); - imagecolortransparent($transparentlayer, $black); $mergeX = floor(abs($x - $newXsize) * 0.5); $mergeY = floor(abs($y - $newYsize) * 0.5); - imagecopymerge($transparentlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize, 100); + imagecopy($backgroundlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize); + + //$black = imagecolorallocate(0,0,0); + //imagecolortransparent($transparentlayer, $black); - $image = new \OC_Image($transparentlayer); + $image = new \OC_Image($backgroundlayer); $this->preview = $image; return; -- cgit v1.2.3 From f29b8cf68531844c23c45a210e280769a8cece73 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 11:30:44 +0200 Subject: set default value of scalingup to true --- lib/preview.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 44b551006f1..3b6e0ae131e 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -53,7 +53,7 @@ class OC_Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = false){ + public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true){ //set config $this->max_x = OC_Config::getValue('preview_max_x', null); $this->max_y = OC_Config::getValue('preview_max_y', null); @@ -493,7 +493,7 @@ class OC_Preview { * use: ?scalingup=0 / ?scalingup = 1 * do not use ?scalingup=false / ?scalingup = true as these will always be true */ - $scalingup = false; + $scalingup = true; if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; @@ -517,7 +517,7 @@ class OC_Preview { $file = ''; $maxX = 0; $maxY = 0; - $scalingup = false; + $scalingup = true; $token = ''; $user = null; -- cgit v1.2.3 From 04a4234b9eba85dc1a2f690c12e6a59381a74a54 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 11:32:42 +0200 Subject: implement mp3 preview backend --- lib/preview/mp3.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 2481e743783..f5fac0b8366 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -5,14 +5,30 @@ * later. * See the COPYING-README file. */ +require_once('getid3/getid3.php'); + class OC_Preview_MP3 extends OC_Preview_Provider{ public function getMimeType(){ return '/audio\/mpeg/'; } - public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $getID3 = new getID3(); + //Todo - add stream support + $tags = $getID3->analyze($fileview->getLocalFile($path)); + getid3_lib::CopyTagsToComments($tags); + $picture = @$tags['id3v2']['APIC'][0]['data']; + + $image = new \OC_Image($picture); + if (!$image->valid()) return $this->getNoCoverThumbnail($maxX, $maxY); + return $image; + } + + public function getNoCoverThumbnail($maxX, $maxY){ + $image = new \OC_Image(); + return $image; } } -- cgit v1.2.3 From 8b39a085121fae7823046f209eecc3484cf5c936 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 12:00:32 +0200 Subject: fix typo --- lib/preview/images.php | 2 +- lib/preview/movies.php | 2 +- lib/preview/mp3.php | 2 +- lib/preview/pdf.php | 2 +- lib/preview/unknown.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index 6766cdb2148..589c7d829d5 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -1,7 +1,7 @@ Date: Fri, 17 May 2013 15:06:37 +0200 Subject: implement movie previews --- lib/preview/movies.php | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 1f0ceb3ace3..868755a1205 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -7,7 +7,6 @@ * See the COPYING-README file. */ if(!is_null(shell_exec('ffmpeg -version'))){ - class OC_Preview_Movie extends OC_Preview_Provider{ public function getMimeType(){ @@ -15,28 +14,18 @@ if(!is_null(shell_exec('ffmpeg -version'))){ } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $thumbnails_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/'.OC_Preview::THUMBNAILS_FOLDER); - - // is a preview already in the cache? - if ($thumbnails_view->file_exists($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)) { - return new \OC_Image($thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup)); - } - - // does the sourcefile exist? - if (!\OC_Filesystem::file_exists($path)) { - \OC_Log::write('Preview', 'File '.$path.' don\'t exists', \OC_Log::WARN); - return false; - } - - // call ffmpeg to do the screenshot - shell_exec('ffmpeg -y -i {'.escapeshellarg($path).'} -f mjpeg -vframes 1 -ss 1 -s {'.escapeshellarg($maxX).'}x{'.escapeshellarg($maxY).'} {.'.$thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup).'}'); - - // output the generated Preview - $thumbnails_view->getLocalFile($path.'-'.$maxX.'-'.$maxY.'-'.$scalingup); - unset($thumbnails_view); + $abspath = $fileview->getLocalfile($path); + + $tmppath = OC_Helper::tmpFile(); + + $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; + shell_exec($cmd); + + $image = new \OC_Image($tmppath); + if (!$image->valid()) return false; + + return $image; } - } - OC_Preview::registerProvider('OC_Preview_Movie'); } \ No newline at end of file -- cgit v1.2.3 From dd06387a9c65dfaf8d95e6545586f7a042bfd44e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 17 May 2013 19:08:16 +0200 Subject: remove whitespace --- lib/preview.php | 79 ++++++++++++++++++++++++------------------------ lib/preview/images.php | 2 +- lib/preview/movies.php | 10 +++--- lib/preview/mp3.php | 2 +- lib/preview/pdf.php | 2 +- lib/preview/provider.php | 2 +- lib/preview/unknown.php | 21 +++---------- 7 files changed, 53 insertions(+), 65 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 3b6e0ae131e..d6c72603524 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -20,7 +20,7 @@ require_once('preview/unknown.php'); class OC_Preview { //the thumbnail folder const THUMBNAILS_FOLDER = 'thumbnails'; - + //config private $max_scale_factor; private $max_x; @@ -35,7 +35,7 @@ class OC_Preview { private $maxX; private $maxY; private $scalingup; - + private $preview; //preview providers @@ -58,7 +58,7 @@ class OC_Preview { $this->max_x = OC_Config::getValue('preview_max_x', null); $this->max_y = OC_Config::getValue('preview_max_y', null); $this->max_scale_factor = OC_Config::getValue('preview_max_scale_factor', 10); - + //save parameters $this->file = $file; $this->maxX = $maxX; @@ -112,7 +112,7 @@ class OC_Preview { throw new Exception('Height and/or width set to 0'); } } - + /** * @brief returns the path of the file you want a thumbnail from * @return string @@ -120,7 +120,7 @@ class OC_Preview { public function getFile(){ return $this->file; } - + /** * @brief returns the max width of the preview * @return integer @@ -136,7 +136,7 @@ class OC_Preview { public function getMaxY(){ return $this->maxY; } - + /** * @brief returns whether or not scalingup is enabled * @return bool @@ -144,7 +144,7 @@ class OC_Preview { public function getScalingup(){ return $this->scalingup; } - + /** * @brief returns the name of the thumbnailfolder * @return string @@ -176,7 +176,7 @@ class OC_Preview { public function getConfigMaxY(){ return $this->max_y; } - + /** * @brief deletes previews of a file with specific x and y * @return bool @@ -303,27 +303,27 @@ class OC_Preview { $this->preview = $image; }else{ $mimetype = $this->fileview->getMimeType($file); - + $preview; - + foreach(self::$providers as $supportedmimetype => $provider){ if(!preg_match($supportedmimetype, $mimetype)){ continue; } - + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); if(!$preview){ continue; } - + if(!($preview instanceof \OC_Image)){ $preview = @new \OC_Image($preview); } - + //cache thumbnail $preview->save($this->userview->getLocalFile(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')); - + break; } $this->preview = $preview; @@ -396,12 +396,12 @@ class OC_Preview { // resize $image->preciseResize($newXsize, $newYsize); - + if($newXsize === $x && $newYsize === $y){ $this->preview = $image; return; } - + if($newXsize >= $x && $newYsize >= $y){ $cropX = floor(abs($x - $newXsize) * 0.5); $cropY = floor(abs($y - $newYsize) * 0.5); @@ -411,38 +411,38 @@ class OC_Preview { $this->preview = $image; return; } - + if($newXsize < $x || $newYsize < $y){ if($newXsize > $x){ $cropX = floor(($newXsize - $x) * 0.5); $image->crop($cropX, 0, $x, $newYsize); } - + if($newYsize > $y){ $cropY = floor(($newYsize - $y) * 0.5); $image->crop(0, $cropY, $newXsize, $y); } - + $newXsize = (int) $image->width(); $newYsize = (int) $image->height(); - + //create transparent background layer $backgroundlayer = imagecreatetruecolor($x, $y); $white = imagecolorallocate($backgroundlayer, 255, 255, 255); imagefill($backgroundlayer, 0, 0, $white); - + $image = $image->resource(); - + $mergeX = floor(abs($x - $newXsize) * 0.5); $mergeY = floor(abs($y - $newYsize) * 0.5); - + imagecopy($backgroundlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize); - + //$black = imagecolorallocate(0,0,0); //imagecolortransparent($transparentlayer, $black); - + $image = new \OC_Image($backgroundlayer); - + $this->preview = $image; return; } @@ -465,27 +465,27 @@ class OC_Preview { if(count(self::$providers)>0) { return; } - + foreach(self::$registeredProviders as $provider) { $class=$provider['class']; $options=$provider['options']; - + $object = new $class($options); - + self::$providers[$object->getMimeType()] = $object; } - + $keys = array_map('strlen', array_keys(self::$providers)); array_multisort($keys, SORT_DESC, self::$providers); } - + /** * @brief method that handles preview requests from users that are logged in * @return void */ public static function previewRouter($params){ OC_Util::checkLoggedIn(); - + $file = ''; $maxX = 0; $maxY = 0; @@ -494,12 +494,12 @@ class OC_Preview { * do not use ?scalingup=false / ?scalingup = true as these will always be true */ $scalingup = true; - + if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - + if($file !== '' && $maxX !== 0 && $maxY !== 0){ $preview = new OC_Preview(OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); $preview->showPreview(); @@ -508,7 +508,7 @@ class OC_Preview { exit; } } - + /** * @brief method that handles preview requests from users that are not logged in / view shared folders that are public * @return void @@ -519,23 +519,23 @@ class OC_Preview { $maxY = 0; $scalingup = true; $token = ''; - + $user = null; $path = null; - + if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - + $linkItem = OCP\Share::getShareByToken($token); if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { $userid = $linkItem['uid_owner']; OC_Util::setupFS($fileOwner); $path = $linkItem['file_source']; } - + if($user !== null && $path !== null){ $preview = new OC_Preview($userid, $path, $file, $maxX, $maxY, $scalingup); $preview->showPreview(); @@ -543,6 +543,5 @@ class OC_Preview { OC_Response::setStatus(404); exit; } - } } \ No newline at end of file diff --git a/lib/preview/images.php b/lib/preview/images.php index 589c7d829d5..a0df337d58e 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -11,7 +11,7 @@ class OC_Preview_Image extends OC_Preview_Provider{ public function getMimeType(){ return '/image\/.*/'; } - + public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { //new image object $image = new \OC_Image(); diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 868755a1205..8144956c998 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -12,18 +12,18 @@ if(!is_null(shell_exec('ffmpeg -version'))){ public function getMimeType(){ return '/video\/.*/'; } - + public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { $abspath = $fileview->getLocalfile($path); - + $tmppath = OC_Helper::tmpFile(); - + $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; shell_exec($cmd); - + $image = new \OC_Image($tmppath); if (!$image->valid()) return false; - + return $image; } } diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 5194e165818..6fb4b051f41 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -25,7 +25,7 @@ class OC_Preview_MP3 extends OC_Preview_Provider{ return $image; } - + public function getNoCoverThumbnail($maxX, $maxY){ $image = new \OC_Image(); return $image; diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index f1b7f3eee73..bf1d8b2b3b5 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -15,7 +15,7 @@ class OC_Preview_PDF extends OC_Preview_Provider{ //create imagick object from pdf $pdf = new imagick($fileview->getLocalFile($path) . '[0]'); $pdf->setImageFormat('jpg'); - + //new image object $image = new \OC_Image($pdf); //check if image object is valid diff --git a/lib/preview/provider.php b/lib/preview/provider.php index e9264030144..2f2a0e68486 100644 --- a/lib/preview/provider.php +++ b/lib/preview/provider.php @@ -8,7 +8,7 @@ abstract class OC_Preview_Provider{ public function __construct($options) { $this->options=$options; } - + abstract public function getMimeType(); /** diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 746b0ebb47a..290c18a72d7 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -12,23 +12,12 @@ class OC_Preview_Unknown extends OC_Preview_Provider{ return '/.*/'; } - public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { - // check if GD is installed - if(!extension_loaded('gd') || !function_exists('gd_info')) { - OC_Log::write('preview', __METHOD__.'(): GD module not installed', OC_Log::ERROR); - return false; - } - - // create a white image - $image = imagecreatetruecolor($maxX, $maxY); - $color = imagecolorallocate($image, 255, 255, 255); - imagefill($image, 0, 0, $color); - - // output the image - imagepng($image); - imagedestroy($image); - } + public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { + + $mimetype = $this->fileview->getMimeType($file); + return new \OC_Image(); + } } OC_Preview::registerProvider('OC_Preview_Unknown'); \ No newline at end of file -- cgit v1.2.3 From 13c6ef1ba9c3f857150679d164852d8724ab946f Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 21 May 2013 12:23:31 +0200 Subject: add svg backend --- lib/preview.php | 1 + lib/preview/svg.php | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 lib/preview/svg.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index d6c72603524..572c85057be 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -15,6 +15,7 @@ require_once('preview/images.php'); require_once('preview/movies.php'); require_once('preview/mp3.php'); require_once('preview/pdf.php'); +require_once('preview/svg.php'); require_once('preview/unknown.php'); class OC_Preview { diff --git a/lib/preview/svg.php b/lib/preview/svg.php new file mode 100644 index 00000000000..12b93f696ea --- /dev/null +++ b/lib/preview/svg.php @@ -0,0 +1,28 @@ +readImageBlob($fileview->file_get_contents($path)); + $svg->setImageFormat('jpg'); + + //new image object + $image = new \OC_Image($svg); + //check if image object is valid + if (!$image->valid()) return false; + + return $image; + } +} + +OC_Preview::registerProvider('OC_Preview_SVG'); \ No newline at end of file -- cgit v1.2.3 From 00985068ca249f4087f9f5b634e628afb8e8f7b1 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 22 May 2013 15:12:25 +0200 Subject: add previews for public files --- core/routes.php | 2 ++ lib/preview.php | 24 +++++++++++++++++++----- lib/preview/unknown.php | 10 ++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/core/routes.php b/core/routes.php index be5766cea9d..c45ffee26fd 100644 --- a/core/routes.php +++ b/core/routes.php @@ -44,6 +44,8 @@ $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); $this->create('core_ajax_preview', '/core/preview.png') ->action('OC_Preview', 'previewRouter'); +$this->create('core_ajax_public_preview', '/core/publicpreview.png') + ->action('OC_Preview', 'publicPreviewRouter'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; $this->create('core_lostpassword_index', '/lostpassword/') ->get() diff --git a/lib/preview.php b/lib/preview.php index 572c85057be..39a87ed5396 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -529,16 +529,30 @@ class OC_Preview { if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - + $linkItem = OCP\Share::getShareByToken($token); + if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { $userid = $linkItem['uid_owner']; - OC_Util::setupFS($fileOwner); - $path = $linkItem['file_source']; + OC_Util::setupFS($userid); + $pathid = $linkItem['file_source']; + $path = \OC\Files\Filesystem::getPath($pathid); + } + + //clean up file parameter + $file = \OC\Files\Filesystem::normalizePath($file); + if(!\OC\Files\Filesystem::isValidPath($file)){ + OC_Response::setStatus(403); + exit; + } + + $path = \OC\Files\Filesystem::normalizePath($path, false); + if(substr($path, 0, 1) == '/'){ + $path = substr($path, 1); } - if($user !== null && $path !== null){ - $preview = new OC_Preview($userid, $path, $file, $maxX, $maxY, $scalingup); + if($userid !== null && $path !== null){ + $preview = new OC_Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); $preview->showPreview(); }else{ OC_Response::setStatus(404); diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 290c18a72d7..5bbdcf847f1 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -13,11 +13,13 @@ class OC_Preview_Unknown extends OC_Preview_Provider{ } public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { - - - $mimetype = $this->fileview->getMimeType($file); + /*$mimetype = $fileview->getMimeType($path); + $info = $fileview->getFileInfo($path); + $name = array_key_exists('name', $info) ? $info['name'] : ''; + $size = array_key_exists('size', $info) ? $info['size'] : 0; + $isencrypted = array_key_exists('encrypted', $info) ? $info['encrypted'] : false;*/ // show little lock return new \OC_Image(); } } -OC_Preview::registerProvider('OC_Preview_Unknown'); \ No newline at end of file +OC_Preview::registerProvider('OC_Preview_Unknown'); -- cgit v1.2.3 From f78e00209692d28253b91a432eb02d432c96a695 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 27 May 2013 10:45:21 +0200 Subject: make image preview backend work with encryption --- lib/preview/images.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index a0df337d58e..52aad67ca8b 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -14,11 +14,10 @@ class OC_Preview_Image extends OC_Preview_Provider{ public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { //new image object - $image = new \OC_Image(); - $image->loadFromFile($fileview->getLocalFile($path)); + $image = new \OC_Image($fileview->fopen($path, 'r')); //check if image object is valid if (!$image->valid()) return false; - + return $image; } } -- cgit v1.2.3 From 62411965f9ccfbe66584e91bc325d156e08196d2 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 27 May 2013 11:09:55 +0200 Subject: make svg preview backend work with encryption --- lib/preview/svg.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 12b93f696ea..8f4697dce04 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -13,7 +13,8 @@ class OC_Preview_SVG extends OC_Preview_Provider{ public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { $svg = new Imagick(); - $svg->readImageBlob($fileview->file_get_contents($path)); + $svg->setResolution($maxX, $maxY); + $svg->readImageBlob('' . $fileview->file_get_contents($path)); $svg->setImageFormat('jpg'); //new image object -- cgit v1.2.3 From 005d8e98706fc98d8dc5aa4927bb3ab0e6b00ac2 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 10:21:02 +0200 Subject: update images.php --- lib/preview/images.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index 52aad67ca8b..a8f203528c5 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -13,11 +13,20 @@ class OC_Preview_Image extends OC_Preview_Provider{ } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - //new image object - $image = new \OC_Image($fileview->fopen($path, 'r')); + //get fileinfo + $fileinfo = $fileview->getFileInfo($path); + + //check if file is encrypted + if($fileinfo['encrypted'] === true){ + $image = new \OC_Image($fileview->fopen($path, 'r')); + }else{ + $image = new \OC_Image(); + $image->loadFromFile($fileview->getLocalFile($path)); + } + //check if image object is valid if (!$image->valid()) return false; - + return $image; } } -- cgit v1.2.3 From 707f52f1dbb063595541331f94b3796f0f96ce9a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 10:23:40 +0200 Subject: check if the imagick extension is loaded --- lib/preview/svg.php | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 8f4697dce04..415b7751c2b 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -5,25 +5,29 @@ * later. * See the COPYING-README file. */ -class OC_Preview_SVG extends OC_Preview_Provider{ +if (extension_loaded('imagick')){ - public function getMimeType(){ - return '/image\/svg\+xml/'; - } + class OC_Preview_SVG extends OC_Preview_Provider{ + + public function getMimeType(){ + return '/image\/svg\+xml/'; + } - public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $svg = new Imagick(); - $svg->setResolution($maxX, $maxY); - $svg->readImageBlob('' . $fileview->file_get_contents($path)); - $svg->setImageFormat('jpg'); + public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { + $svg = new Imagick(); + $svg->setResolution($maxX, $maxY); + $svg->readImageBlob('' . $fileview->file_get_contents($path)); + $svg->setImageFormat('jpg'); - //new image object - $image = new \OC_Image($svg); - //check if image object is valid - if (!$image->valid()) return false; + //new image object + $image = new \OC_Image($svg); + //check if image object is valid + if (!$image->valid()) return false; - return $image; + return $image; + } } -} -OC_Preview::registerProvider('OC_Preview_SVG'); \ No newline at end of file + OC_Preview::registerProvider('OC_Preview_SVG'); + +} \ No newline at end of file -- cgit v1.2.3 From 5ae1333c76fd1331e21fff0fc7343888c473c8d4 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 11:29:01 +0200 Subject: add preview backend for text based files --- lib/preview/txt.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 lib/preview/txt.php (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php new file mode 100644 index 00000000000..2b5d8edb893 --- /dev/null +++ b/lib/preview/txt.php @@ -0,0 +1,49 @@ +fopen($path, 'r'); + $content = stream_get_contents($content); + + $lines = preg_split("/\r\n|\n|\r/", $content); + $numoflines = count($lines); + + $fontsize = 5; //5px + $linesize = ceil($fontsize * 1.25); + + $image = imagecreate($maxX, $maxY); + $imagecolor = imagecolorallocate($image, 255, 255, 255); + $textcolor = imagecolorallocate($image, 0, 0, 0); + + foreach($lines as $index => $line){ + $index = $index + 1; + + $x = (int) 1; + $y = (int) ($index * $linesize) - $fontsize; + + imagestring($image, 1, $x, $y, $line, $textcolor); + + if(($index * $linesize) >= $maxY){ + break; + } + } + + $image = new \OC_Image($image); + + if (!$image->valid()) return false; + + return $image; + } +} + +OC_Preview::registerProvider('OC_Preview_TXT'); \ No newline at end of file -- cgit v1.2.3 From 7555332d58c6e684cfbde72d5676e8e1902ae4f3 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 11:31:48 +0200 Subject: remove whitespace --- lib/preview/txt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 2b5d8edb893..1e88aec69fd 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -39,7 +39,7 @@ class OC_Preview_TXT extends OC_Preview_Provider{ } $image = new \OC_Image($image); - + if (!$image->valid()) return false; return $image; -- cgit v1.2.3 From 4d52dfb0a0517a7fd52d20572085aba2ec0e4ad0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 11:48:02 +0200 Subject: make movie backend work with encryption --- lib/preview/movies.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 8144956c998..1e517b38182 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -14,18 +14,25 @@ if(!is_null(shell_exec('ffmpeg -version'))){ } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $abspath = $fileview->getLocalfile($path); + //get fileinfo + $fileinfo = $fileview->getFileInfo($path); + $abspath = $fileview->toTmpFile($path); $tmppath = OC_Helper::tmpFile(); $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; shell_exec($cmd); + unlink($abspath); + $image = new \OC_Image($tmppath); if (!$image->valid()) return false; + unlink($tmppath); + return $image; } } + OC_Preview::registerProvider('OC_Preview_Movie'); } \ No newline at end of file -- cgit v1.2.3 From 738cc48a85f48f8dca2b42d5667d6662810a688b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 11:49:18 +0200 Subject: make mp3 backend work with encryption --- lib/preview/mp3.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 6fb4b051f41..18f5cfde375 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -14,15 +14,20 @@ class OC_Preview_MP3 extends OC_Preview_Provider{ } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $getID3 = new getID3(); + $getID3 = new getID3(); + + $tmppath = $fileview->toTmpFile($path); + //Todo - add stream support - $tags = $getID3->analyze($fileview->getLocalFile($path)); + $tags = $getID3->analyze($tmppath); getid3_lib::CopyTagsToComments($tags); $picture = @$tags['id3v2']['APIC'][0]['data']; - + + unlink($tmppath); + $image = new \OC_Image($picture); if (!$image->valid()) return $this->getNoCoverThumbnail($maxX, $maxY); - + return $image; } -- cgit v1.2.3 From 55b00fe819079d78224989eee91d5886233738ab Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 11:59:20 +0200 Subject: make pdf backend work with encryption --- lib/preview/pdf.php | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index bf1d8b2b3b5..de5263f91d8 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -5,24 +5,31 @@ * later. * See the COPYING-README file. */ -class OC_Preview_PDF extends OC_Preview_Provider{ +if (extension_loaded('imagick')){ - public function getMimeType(){ - return '/application\/pdf/'; - } + class OC_Preview_PDF extends OC_Preview_Provider{ + + public function getMimeType(){ + return '/application\/pdf/'; + } + + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $tmppath = $fileview->toTmpFile($path); - public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { - //create imagick object from pdf - $pdf = new imagick($fileview->getLocalFile($path) . '[0]'); - $pdf->setImageFormat('jpg'); + //create imagick object from pdf + $pdf = new imagick($tmppath . '[0]'); + $pdf->setImageFormat('jpg'); - //new image object - $image = new \OC_Image($pdf); - //check if image object is valid - if (!$image->valid()) return false; + unlink($tmppath); - return $image; + //new image object + $image = new \OC_Image($pdf); + //check if image object is valid + if (!$image->valid()) return false; + + return $image; + } } -} -OC_Preview::registerProvider('OC_Preview_PDF'); \ No newline at end of file + OC_Preview::registerProvider('OC_Preview_PDF'); +} -- cgit v1.2.3 From 08a022aaa48a6bae95ff75204a763a7c16a8253e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 12:09:46 +0200 Subject: don't give ffmpeg wanted size, cause it doesn't care about aspect ratio --- lib/preview/movies.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 1e517b38182..d2aaf730d67 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -20,7 +20,8 @@ if(!is_null(shell_exec('ffmpeg -version'))){ $abspath = $fileview->toTmpFile($path); $tmppath = OC_Helper::tmpFile(); - $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; + //$cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; + $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . $tmppath; shell_exec($cmd); unlink($abspath); -- cgit v1.2.3 From a03787bc422563d129359d34673eb361b0173f51 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 28 May 2013 16:04:39 +0200 Subject: make preview cache work with encryption and improve error handling --- lib/preview.php | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 39a87ed5396..6fc166b9c70 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -16,6 +16,7 @@ require_once('preview/movies.php'); require_once('preview/mp3.php'); require_once('preview/pdf.php'); require_once('preview/svg.php'); +require_once('preview/txt.php'); require_once('preview/unknown.php'); class OC_Preview { @@ -300,7 +301,7 @@ class OC_Preview { $cached = self::isCached(); if($cached){ - $image = new \OC_Image($this->userview->getLocalFile($cached)); + $image = new \OC_Image($this->userview->file_get_contents($cached, 'r')); $this->preview = $image; }else{ $mimetype = $this->fileview->getMimeType($file); @@ -313,17 +314,22 @@ class OC_Preview { } $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); - + if(!$preview){ continue; } - if(!($preview instanceof \OC_Image)){ - $preview = @new \OC_Image($preview); + //are there any cached thumbnails yet + if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/') === false){ + $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/'); } //cache thumbnail - $preview->save($this->userview->getLocalFile(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')); + $cachepath = self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; + if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false){ + $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); + } + $this->userview->file_put_contents($cachepath, $preview->data()); break; } @@ -354,13 +360,13 @@ class OC_Preview { * @return image */ public function resizeAndCrop(){ + $this->preview->fixOrientation(); + $image = $this->preview; $x = $this->maxX; $y = $this->maxY; $scalingup = $this->scalingup; - $image->fixOrientation(); - if(!($image instanceof \OC_Image)){ OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', OC_Log::DEBUG); return; @@ -502,8 +508,14 @@ class OC_Preview { if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; if($file !== '' && $maxX !== 0 && $maxY !== 0){ - $preview = new OC_Preview(OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); - $preview->showPreview(); + try{ + $preview = new OC_Preview(OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); + $preview->showPreview(); + }catch(Exception $e){ + OC_Response::setStatus(404); + OC_Log::write('core', $e->getmessage(), OC_Log::ERROR); + exit; + } }else{ OC_Response::setStatus(404); exit; @@ -552,8 +564,14 @@ class OC_Preview { } if($userid !== null && $path !== null){ - $preview = new OC_Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); - $preview->showPreview(); + try{ + $preview = new OC_Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); + $preview->showPreview(); + }catch(Exception $e){ + OC_Response::setStatus(404); + OC_Log::write('core', $e->getmessage(), OC_Log::ERROR); + exit; + } }else{ OC_Response::setStatus(404); exit; -- cgit v1.2.3 From eebc15dce0da88dff91dc5249938341cd50b8a85 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 12:01:43 +0200 Subject: connect preview lib to filesystem hooks --- lib/base.php | 9 +++++ lib/preview.php | 106 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 71 insertions(+), 44 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 724bd250a5c..ae384225bed 100644 --- a/lib/base.php +++ b/lib/base.php @@ -474,6 +474,7 @@ class OC { self::registerCacheHooks(); self::registerFilesystemHooks(); + self::registerPreviewHooks(); self::registerShareHooks(); //make sure temporary files are cleaned up @@ -539,6 +540,14 @@ class OC { OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); } + /** + * register hooks for previews + */ + public static function registerPreviewHooks() { + OC_Hook::connect('OC_Filesystem', 'post_write', 'OC_Preview', 'post_write'); + OC_Hook::connect('OC_Filesystem', 'delete', 'OC_Preview', 'post_delete'); + } + /** * register hooks for sharing */ diff --git a/lib/preview.php b/lib/preview.php index 6fc166b9c70..7c4db971dfb 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -55,7 +55,7 @@ class OC_Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true){ + public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true, $force = false){ //set config $this->max_x = OC_Config::getValue('preview_max_x', null); $this->max_y = OC_Config::getValue('preview_max_y', null); @@ -71,47 +71,49 @@ class OC_Preview { $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); $this->userview = new \OC\Files\View('/' . $user); - if(!is_null($this->max_x)){ - if($this->maxX > $this->max_x){ - OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG); - $this->maxX = $this->max_x; + if($force !== true){ + if(!is_null($this->max_x)){ + if($this->maxX > $this->max_x){ + OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG); + $this->maxX = $this->max_x; + } } - } - - if(!is_null($this->max_y)){ - if($this->maxY > $this->max_y){ - OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG); - $this->maxY = $this->max_y; + + if(!is_null($this->max_y)){ + if($this->maxY > $this->max_y){ + OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG); + $this->maxY = $this->max_y; + } + } + + //init providers + if(empty(self::$providers)){ + self::initProviders(); + } + + //check if there are any providers at all + if(empty(self::$providers)){ + OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR); + throw new Exception('No providers'); + } + + //validate parameters + if($file === ''){ + OC_Log::write('core', 'No filename passed', OC_Log::ERROR); + throw new Exception('File not found'); + } + + //check if file exists + if(!$this->fileview->file_exists($file)){ + OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR); + throw new Exception('File not found'); + } + + //check if given size makes sense + if($maxX === 0 || $maxY === 0){ + OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR); + throw new Exception('Height and/or width set to 0'); } - } - - //init providers - if(empty(self::$providers)){ - self::initProviders(); - } - - //check if there are any providers at all - if(empty(self::$providers)){ - OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR); - throw new Exception('No providers'); - } - - //validate parameters - if($file === ''){ - OC_Log::write('core', 'No filename passed', OC_Log::ERROR); - throw new Exception('File not found'); - } - - //check if file exists - if(!$this->fileview->file_exists($file)){ - OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR); - throw new Exception('File not found'); - } - - //check if given size makes sense - if($maxX === 0 || $maxY === 0){ - OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR); - throw new Exception('Height and/or width set to 0'); } } @@ -186,19 +188,22 @@ class OC_Preview { public function deletePreview(){ $fileinfo = $this->fileview->getFileInfo($this->file); $fileid = $fileinfo['fileid']; - - return $this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png'); + + $this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png'); + return; } /** * @brief deletes all previews of a file * @return bool */ - public function deleteAllPrevies(){ + public function deleteAllPreviews(){ $fileinfo = $this->fileview->getFileInfo($this->file); $fileid = $fileinfo['fileid']; - return $this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid); + $this->userview->deleteAll(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); + $this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); + return; } /** @@ -577,4 +582,17 @@ class OC_Preview { exit; } } + + public static function post_write($args){ + self::post_delete($args); + } + + public static function post_delete($args){ + $path = $args['path']; + if(substr($path, 0, 1) == '/'){ + $path = substr($path, 1); + } + $preview = new OC_Preview(OC_User::getUser(), 'files/', $path, 0, 0, false, true); + $preview->deleteAllPreviews(); + } } \ No newline at end of file -- cgit v1.2.3 From fa6b96090abc341da4f9320af02ee75b29a204e6 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 12:33:24 +0200 Subject: move to OC namespace --- core/routes.php | 4 +-- lib/base.php | 4 +-- lib/preview.php | 64 +++++++++++++++++++++++++----------------------- lib/preview/images.php | 6 +++-- lib/preview/movies.php | 8 +++--- lib/preview/mp3.php | 10 +++++--- lib/preview/pdf.php | 8 +++--- lib/preview/provider.php | 4 ++- lib/preview/svg.php | 16 +++++++++--- lib/preview/txt.php | 6 +++-- lib/preview/unknown.php | 6 +++-- 11 files changed, 80 insertions(+), 56 deletions(-) (limited to 'lib') diff --git a/core/routes.php b/core/routes.php index c45ffee26fd..4b3ad53da01 100644 --- a/core/routes.php +++ b/core/routes.php @@ -43,9 +43,9 @@ $this->create('js_config', '/core/js/config.js') $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); $this->create('core_ajax_preview', '/core/preview.png') - ->action('OC_Preview', 'previewRouter'); + ->action('OC\Preview', 'previewRouter'); $this->create('core_ajax_public_preview', '/core/publicpreview.png') - ->action('OC_Preview', 'publicPreviewRouter'); + ->action('OC\Preview', 'publicPreviewRouter'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; $this->create('core_lostpassword_index', '/lostpassword/') ->get() diff --git a/lib/base.php b/lib/base.php index ae384225bed..525b259f673 100644 --- a/lib/base.php +++ b/lib/base.php @@ -544,8 +544,8 @@ class OC { * register hooks for previews */ public static function registerPreviewHooks() { - OC_Hook::connect('OC_Filesystem', 'post_write', 'OC_Preview', 'post_write'); - OC_Hook::connect('OC_Filesystem', 'delete', 'OC_Preview', 'post_delete'); + OC_Hook::connect('OC_Filesystem', 'post_write', 'OC\Preview', 'post_write'); + OC_Hook::connect('OC_Filesystem', 'delete', 'OC\Preview', 'post_delete'); } /** diff --git a/lib/preview.php b/lib/preview.php index 7c4db971dfb..31812035c49 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -11,6 +11,8 @@ * /data/user/thumbnails/pathhash/x-y.png * */ +namespace OC; + require_once('preview/images.php'); require_once('preview/movies.php'); require_once('preview/mp3.php'); @@ -19,7 +21,7 @@ require_once('preview/svg.php'); require_once('preview/txt.php'); require_once('preview/unknown.php'); -class OC_Preview { +class Preview { //the thumbnail folder const THUMBNAILS_FOLDER = 'thumbnails'; @@ -57,9 +59,9 @@ class OC_Preview { */ public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true, $force = false){ //set config - $this->max_x = OC_Config::getValue('preview_max_x', null); - $this->max_y = OC_Config::getValue('preview_max_y', null); - $this->max_scale_factor = OC_Config::getValue('preview_max_scale_factor', 10); + $this->max_x = \OC_Config::getValue('preview_max_x', null); + $this->max_y = \OC_Config::getValue('preview_max_y', null); + $this->max_scale_factor = \OC_Config::getValue('preview_max_scale_factor', 10); //save parameters $this->file = $file; @@ -74,14 +76,14 @@ class OC_Preview { if($force !== true){ if(!is_null($this->max_x)){ if($this->maxX > $this->max_x){ - OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG); + \OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, \OC_Log::DEBUG); $this->maxX = $this->max_x; } } if(!is_null($this->max_y)){ if($this->maxY > $this->max_y){ - OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG); + \OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, \OC_Log::DEBUG); $this->maxY = $this->max_y; } } @@ -93,26 +95,26 @@ class OC_Preview { //check if there are any providers at all if(empty(self::$providers)){ - OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR); - throw new Exception('No providers'); + \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); + throw new \Exception('No providers'); } //validate parameters if($file === ''){ - OC_Log::write('core', 'No filename passed', OC_Log::ERROR); - throw new Exception('File not found'); + \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); + throw new \Exception('File not found'); } //check if file exists if(!$this->fileview->file_exists($file)){ - OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR); - throw new Exception('File not found'); + \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); + throw new \Exception('File not found'); } //check if given size makes sense if($maxX === 0 || $maxY === 0){ - OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR); - throw new Exception('Height and/or width set to 0'); + \OC_Log::write('core', 'Can not create preview with 0px width or 0px height', \OC_Log::ERROR); + throw new \Exception('Height and/or width set to 0'); } } } @@ -353,7 +355,7 @@ class OC_Preview { * @return void */ public function showPreview(){ - OCP\Response::enableCaching(3600 * 24); // 24 hour + \OCP\Response::enableCaching(3600 * 24); // 24 hour $preview = $this->getPreview(); if($preview){ $preview->show(); @@ -373,7 +375,7 @@ class OC_Preview { $scalingup = $this->scalingup; if(!($image instanceof \OC_Image)){ - OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', OC_Log::DEBUG); + OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', \OC_Log::DEBUG); return; } @@ -399,7 +401,7 @@ class OC_Preview { } if(!is_null($this->max_scale_factor)){ if($factor > $this->max_scale_factor){ - OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $this->max_scale_factor, OC_Log::DEBUG); + \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $this->max_scale_factor, \OC_Log::DEBUG); $factor = $this->max_scale_factor; } } @@ -462,7 +464,7 @@ class OC_Preview { /** * @brief register a new preview provider to be used - * @param string $provider class name of a OC_Preview_Provider + * @param string $provider class name of a Preview_Provider * @return void */ public static function registerProvider($class, $options=array()){ @@ -496,7 +498,7 @@ class OC_Preview { * @return void */ public static function previewRouter($params){ - OC_Util::checkLoggedIn(); + \OC_Util::checkLoggedIn(); $file = ''; $maxX = 0; @@ -514,15 +516,15 @@ class OC_Preview { if($file !== '' && $maxX !== 0 && $maxY !== 0){ try{ - $preview = new OC_Preview(OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); + $preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); $preview->showPreview(); }catch(Exception $e){ - OC_Response::setStatus(404); - OC_Log::write('core', $e->getmessage(), OC_Log::ERROR); + \OC_Response::setStatus(404); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; } }else{ - OC_Response::setStatus(404); + \OC_Response::setStatus(404); exit; } } @@ -547,11 +549,11 @@ class OC_Preview { if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - $linkItem = OCP\Share::getShareByToken($token); + $linkItem = \OCP\Share::getShareByToken($token); if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { $userid = $linkItem['uid_owner']; - OC_Util::setupFS($userid); + \OC_Util::setupFS($userid); $pathid = $linkItem['file_source']; $path = \OC\Files\Filesystem::getPath($pathid); } @@ -559,7 +561,7 @@ class OC_Preview { //clean up file parameter $file = \OC\Files\Filesystem::normalizePath($file); if(!\OC\Files\Filesystem::isValidPath($file)){ - OC_Response::setStatus(403); + \OC_Response::setStatus(403); exit; } @@ -570,15 +572,15 @@ class OC_Preview { if($userid !== null && $path !== null){ try{ - $preview = new OC_Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); + $preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); $preview->showPreview(); }catch(Exception $e){ - OC_Response::setStatus(404); - OC_Log::write('core', $e->getmessage(), OC_Log::ERROR); + \OC_Response::setStatus(404); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; } }else{ - OC_Response::setStatus(404); + \OC_Response::setStatus(404); exit; } } @@ -592,7 +594,7 @@ class OC_Preview { if(substr($path, 0, 1) == '/'){ $path = substr($path, 1); } - $preview = new OC_Preview(OC_User::getUser(), 'files/', $path, 0, 0, false, true); + $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); $preview->deleteAllPreviews(); } } \ No newline at end of file diff --git a/lib/preview/images.php b/lib/preview/images.php index a8f203528c5..c62fc5397e5 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -6,7 +6,9 @@ * later. * See the COPYING-README file. */ -class OC_Preview_Image extends OC_Preview_Provider{ +namespace OC\Preview; + +class Image extends Provider{ public function getMimeType(){ return '/image\/.*/'; @@ -31,4 +33,4 @@ class OC_Preview_Image extends OC_Preview_Provider{ } } -OC_Preview::registerProvider('OC_Preview_Image'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\Image'); \ No newline at end of file diff --git a/lib/preview/movies.php b/lib/preview/movies.php index d2aaf730d67..14ac97b552d 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -6,8 +6,10 @@ * later. * See the COPYING-README file. */ +namespace OC\Preview; + if(!is_null(shell_exec('ffmpeg -version'))){ - class OC_Preview_Movie extends OC_Preview_Provider{ + class Movie extends Provider{ public function getMimeType(){ return '/video\/.*/'; @@ -18,7 +20,7 @@ if(!is_null(shell_exec('ffmpeg -version'))){ $fileinfo = $fileview->getFileInfo($path); $abspath = $fileview->toTmpFile($path); - $tmppath = OC_Helper::tmpFile(); + $tmppath = \OC_Helper::tmpFile(); //$cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . $tmppath; @@ -35,5 +37,5 @@ if(!is_null(shell_exec('ffmpeg -version'))){ } } - OC_Preview::registerProvider('OC_Preview_Movie'); + \OC\Preview::registerProvider('OC\Preview\Movie'); } \ No newline at end of file diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 18f5cfde375..d62c7230788 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -5,22 +5,24 @@ * later. * See the COPYING-README file. */ +namespace OC\Preview; + require_once('getid3/getid3.php'); -class OC_Preview_MP3 extends OC_Preview_Provider{ +class MP3 extends Provider{ public function getMimeType(){ return '/audio\/mpeg/'; } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $getID3 = new getID3(); + $getID3 = new \getID3(); $tmppath = $fileview->toTmpFile($path); //Todo - add stream support $tags = $getID3->analyze($tmppath); - getid3_lib::CopyTagsToComments($tags); + \getid3_lib::CopyTagsToComments($tags); $picture = @$tags['id3v2']['APIC'][0]['data']; unlink($tmppath); @@ -38,4 +40,4 @@ class OC_Preview_MP3 extends OC_Preview_Provider{ } -OC_Preview::registerProvider('OC_Preview_MP3'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\MP3'); \ No newline at end of file diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index de5263f91d8..4dd4538545c 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -5,9 +5,11 @@ * later. * See the COPYING-README file. */ +namespace OC\Preview; + if (extension_loaded('imagick')){ - class OC_Preview_PDF extends OC_Preview_Provider{ + class PDF extends Provider{ public function getMimeType(){ return '/application\/pdf/'; @@ -17,7 +19,7 @@ if (extension_loaded('imagick')){ $tmppath = $fileview->toTmpFile($path); //create imagick object from pdf - $pdf = new imagick($tmppath . '[0]'); + $pdf = new \imagick($tmppath . '[0]'); $pdf->setImageFormat('jpg'); unlink($tmppath); @@ -31,5 +33,5 @@ if (extension_loaded('imagick')){ } } - OC_Preview::registerProvider('OC_Preview_PDF'); + \OC\Preview::registerProvider('OC\Preview\PDF'); } diff --git a/lib/preview/provider.php b/lib/preview/provider.php index 2f2a0e68486..1e8d537adc8 100644 --- a/lib/preview/provider.php +++ b/lib/preview/provider.php @@ -2,7 +2,9 @@ /** * provides search functionalty */ -abstract class OC_Preview_Provider{ +namespace OC\Preview; + +abstract class Provider{ private $options; public function __construct($options) { diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 415b7751c2b..70be263189d 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -5,18 +5,26 @@ * later. * See the COPYING-README file. */ +namespace OC\Preview; + if (extension_loaded('imagick')){ - class OC_Preview_SVG extends OC_Preview_Provider{ + class SVG extends Provider{ public function getMimeType(){ return '/image\/svg\+xml/'; } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $svg = new Imagick(); + $svg = new \Imagick(); $svg->setResolution($maxX, $maxY); - $svg->readImageBlob('' . $fileview->file_get_contents($path)); + + $content = stream_get_contents($fileview->fopen($path, 'r')); + if(substr($content, 0, 5) !== '' . $content; + } + + $svg->readImageBlob($content); $svg->setImageFormat('jpg'); //new image object @@ -28,6 +36,6 @@ if (extension_loaded('imagick')){ } } - OC_Preview::registerProvider('OC_Preview_SVG'); + \OC\Preview::registerProvider('OC\Preview\SVG'); } \ No newline at end of file diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 1e88aec69fd..4004ecd3fce 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -5,7 +5,9 @@ * later. * See the COPYING-README file. */ -class OC_Preview_TXT extends OC_Preview_Provider{ +namespace OC\Preview; + +class TXT extends Provider{ public function getMimeType(){ return '/text\/.*/'; @@ -46,4 +48,4 @@ class OC_Preview_TXT extends OC_Preview_Provider{ } } -OC_Preview::registerProvider('OC_Preview_TXT'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\TXT'); \ No newline at end of file diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 5bbdcf847f1..6a8d2fbb75c 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -6,7 +6,9 @@ * later. * See the COPYING-README file. */ -class OC_Preview_Unknown extends OC_Preview_Provider{ +namespace OC\Preview; + +class Unknown extends Provider{ public function getMimeType(){ return '/.*/'; @@ -22,4 +24,4 @@ class OC_Preview_Unknown extends OC_Preview_Provider{ } } -OC_Preview::registerProvider('OC_Preview_Unknown'); +\OC\Preview::registerProvider('OC\Preview\Unknown'); -- cgit v1.2.3 From 268246fac833837d7b9e7a6a2a4559cfadc0a7ab Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 12:48:21 +0200 Subject: namespace fix --- lib/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 31812035c49..855d5a9da04 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -375,7 +375,7 @@ class Preview { $scalingup = $this->scalingup; if(!($image instanceof \OC_Image)){ - OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', \OC_Log::DEBUG); + \OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', \OC_Log::DEBUG); return; } -- cgit v1.2.3 From 7408ab660af2c681ca6abfb15d6230382f35dd7c Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 13:03:33 +0200 Subject: respect coding style guidelines --- lib/preview.php | 136 +++++++++++++++++++++++------------------------ lib/preview/images.php | 6 +-- lib/preview/movies.php | 6 +-- lib/preview/mp3.php | 4 +- lib/preview/pdf.php | 4 +- lib/preview/provider.php | 2 +- lib/preview/svg.php | 6 +-- lib/preview/txt.php | 8 +-- lib/preview/unknown.php | 4 +- 9 files changed, 88 insertions(+), 88 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 855d5a9da04..1150681e64f 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -57,7 +57,7 @@ class Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true, $force = false){ + public function __construct($user=null, $root='', $file='', $maxX=0, $maxY=0, $scalingup=true, $force=false) { //set config $this->max_x = \OC_Config::getValue('preview_max_x', null); $this->max_y = \OC_Config::getValue('preview_max_y', null); @@ -73,46 +73,46 @@ class Preview { $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); $this->userview = new \OC\Files\View('/' . $user); - if($force !== true){ - if(!is_null($this->max_x)){ - if($this->maxX > $this->max_x){ + if($force !== true) { + if(!is_null($this->max_x)) { + if($this->maxX > $this->max_x) { \OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, \OC_Log::DEBUG); $this->maxX = $this->max_x; } } - if(!is_null($this->max_y)){ - if($this->maxY > $this->max_y){ + if(!is_null($this->max_y)) { + if($this->maxY > $this->max_y) { \OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, \OC_Log::DEBUG); $this->maxY = $this->max_y; } } //init providers - if(empty(self::$providers)){ + if(empty(self::$providers)) { self::initProviders(); } //check if there are any providers at all - if(empty(self::$providers)){ + if(empty(self::$providers)) { \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); throw new \Exception('No providers'); } //validate parameters - if($file === ''){ + if($file === '') { \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); throw new \Exception('File not found'); } //check if file exists - if(!$this->fileview->file_exists($file)){ + if(!$this->fileview->file_exists($file)) { \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); throw new \Exception('File not found'); } //check if given size makes sense - if($maxX === 0 || $maxY === 0){ + if($maxX === 0 || $maxY === 0) { \OC_Log::write('core', 'Can not create preview with 0px width or 0px height', \OC_Log::ERROR); throw new \Exception('Height and/or width set to 0'); } @@ -123,7 +123,7 @@ class Preview { * @brief returns the path of the file you want a thumbnail from * @return string */ - public function getFile(){ + public function getFile() { return $this->file; } @@ -131,7 +131,7 @@ class Preview { * @brief returns the max width of the preview * @return integer */ - public function getMaxX(){ + public function getMaxX() { return $this->maxX; } @@ -139,7 +139,7 @@ class Preview { * @brief returns the max height of the preview * @return integer */ - public function getMaxY(){ + public function getMaxY() { return $this->maxY; } @@ -147,7 +147,7 @@ class Preview { * @brief returns whether or not scalingup is enabled * @return bool */ - public function getScalingup(){ + public function getScalingup() { return $this->scalingup; } @@ -155,7 +155,7 @@ class Preview { * @brief returns the name of the thumbnailfolder * @return string */ - public function getThumbnailsfolder(){ + public function getThumbnailsfolder() { return self::THUMBNAILS_FOLDER; } @@ -163,7 +163,7 @@ class Preview { * @brief returns the max scale factor * @return integer */ - public function getMaxScaleFactor(){ + public function getMaxScaleFactor() { return $this->max_scale_factor; } @@ -171,7 +171,7 @@ class Preview { * @brief returns the max width set in ownCloud's config * @return integer */ - public function getConfigMaxX(){ + public function getConfigMaxX() { return $this->max_x; } @@ -179,7 +179,7 @@ class Preview { * @brief returns the max height set in ownCloud's config * @return integer */ - public function getConfigMaxY(){ + public function getConfigMaxY() { return $this->max_y; } @@ -187,7 +187,7 @@ class Preview { * @brief deletes previews of a file with specific x and y * @return bool */ - public function deletePreview(){ + public function deletePreview() { $fileinfo = $this->fileview->getFileInfo($this->file); $fileid = $fileinfo['fileid']; @@ -199,7 +199,7 @@ class Preview { * @brief deletes all previews of a file * @return bool */ - public function deleteAllPreviews(){ + public function deleteAllPreviews() { $fileinfo = $this->fileview->getFileInfo($this->file); $fileid = $fileinfo['fileid']; @@ -214,7 +214,7 @@ class Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - private function isCached(){ + private function isCached() { $file = $this->file; $maxX = $this->maxX; $maxY = $this->maxY; @@ -223,12 +223,12 @@ class Preview { $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; - if(!$this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid)){ + if(!$this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid)) { return false; } //does a preview with the wanted height and width already exist? - if($this->userview->file_exists(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')){ + if($this->userview->file_exists(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')) { return self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; } @@ -238,20 +238,20 @@ class Preview { $possiblethumbnails = array(); $allthumbnails = $this->userview->getDirectoryContent(self::THUMBNAILS_FOLDER . '/' . $fileid); - foreach($allthumbnails as $thumbnail){ + foreach($allthumbnails as $thumbnail) { $size = explode('-', $thumbnail['name']); $x = $size[0]; $y = $size[1]; $aspectratio = $x / $y; - if($aspectratio != $wantedaspectratio){ + if($aspectratio != $wantedaspectratio) { continue; } - if($x < $maxX || $y < $maxY){ - if($scalingup){ + if($x < $maxX || $y < $maxY) { + if($scalingup) { $scalefactor = $maxX / $x; - if($scalefactor > $this->max_scale_factor){ + if($scalefactor > $this->max_scale_factor) { continue; } }else{ @@ -261,26 +261,26 @@ class Preview { $possiblethumbnails[$x] = $thumbnail['path']; } - if(count($possiblethumbnails) === 0){ + if(count($possiblethumbnails) === 0) { return false; } - if(count($possiblethumbnails) === 1){ + if(count($possiblethumbnails) === 1) { return current($possiblethumbnails); } ksort($possiblethumbnails); - if(key(reset($possiblethumbnails)) > $maxX){ + if(key(reset($possiblethumbnails)) > $maxX) { return current(reset($possiblethumbnails)); } - if(key(end($possiblethumbnails)) < $maxX){ + if(key(end($possiblethumbnails)) < $maxX) { return current(end($possiblethumbnails)); } - foreach($possiblethumbnails as $width => $path){ - if($width < $maxX){ + foreach($possiblethumbnails as $width => $path) { + if($width < $maxX) { continue; }else{ return $path; @@ -296,7 +296,7 @@ class Preview { * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return image */ - public function getPreview(){ + public function getPreview() { $file = $this->file; $maxX = $this->maxX; $maxY = $this->maxY; @@ -307,7 +307,7 @@ class Preview { $cached = self::isCached(); - if($cached){ + if($cached) { $image = new \OC_Image($this->userview->file_get_contents($cached, 'r')); $this->preview = $image; }else{ @@ -315,25 +315,25 @@ class Preview { $preview; - foreach(self::$providers as $supportedmimetype => $provider){ - if(!preg_match($supportedmimetype, $mimetype)){ + foreach(self::$providers as $supportedmimetype => $provider) { + if(!preg_match($supportedmimetype, $mimetype)) { continue; } $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); - if(!$preview){ + if(!$preview) { continue; } //are there any cached thumbnails yet - if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/') === false){ + if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/') === false) { $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/'); } //cache thumbnail $cachepath = self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; - if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false){ + if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false) { $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); } $this->userview->file_put_contents($cachepath, $preview->data()); @@ -354,10 +354,10 @@ class Preview { * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return void */ - public function showPreview(){ + public function showPreview() { \OCP\Response::enableCaching(3600 * 24); // 24 hour $preview = $this->getPreview(); - if($preview){ + if($preview) { $preview->show(); } } @@ -366,7 +366,7 @@ class Preview { * @brief resize, crop and fix orientation * @return image */ - public function resizeAndCrop(){ + public function resizeAndCrop() { $this->preview->fixOrientation(); $image = $this->preview; @@ -374,7 +374,7 @@ class Preview { $y = $this->maxY; $scalingup = $this->scalingup; - if(!($image instanceof \OC_Image)){ + if(!($image instanceof \OC_Image)) { \OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', \OC_Log::DEBUG); return; } @@ -382,14 +382,14 @@ class Preview { $realx = (int) $image->width(); $realy = (int) $image->height(); - if($x === $realx && $y === $realy){ + if($x === $realx && $y === $realy) { return $image; } $factorX = $x / $realx; $factorY = $y / $realy; - if($factorX >= $factorY){ + if($factorX >= $factorY) { $factor = $factorX; }else{ $factor = $factorY; @@ -399,8 +399,8 @@ class Preview { if($scalingup === false) { if($factor>1) $factor=1; } - if(!is_null($this->max_scale_factor)){ - if($factor > $this->max_scale_factor){ + if(!is_null($this->max_scale_factor)) { + if($factor > $this->max_scale_factor) { \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $this->max_scale_factor, \OC_Log::DEBUG); $factor = $this->max_scale_factor; } @@ -411,12 +411,12 @@ class Preview { // resize $image->preciseResize($newXsize, $newYsize); - if($newXsize === $x && $newYsize === $y){ + if($newXsize === $x && $newYsize === $y) { $this->preview = $image; return; } - if($newXsize >= $x && $newYsize >= $y){ + if($newXsize >= $x && $newYsize >= $y) { $cropX = floor(abs($x - $newXsize) * 0.5); $cropY = floor(abs($y - $newYsize) * 0.5); @@ -426,13 +426,13 @@ class Preview { return; } - if($newXsize < $x || $newYsize < $y){ - if($newXsize > $x){ + if($newXsize < $x || $newYsize < $y) { + if($newXsize > $x) { $cropX = floor(($newXsize - $x) * 0.5); $image->crop($cropX, 0, $x, $newYsize); } - if($newYsize > $y){ + if($newYsize > $y) { $cropY = floor(($newYsize - $y) * 0.5); $image->crop(0, $cropY, $newXsize, $y); } @@ -467,7 +467,7 @@ class Preview { * @param string $provider class name of a Preview_Provider * @return void */ - public static function registerProvider($class, $options=array()){ + public static function registerProvider($class, $options=array()) { self::$registeredProviders[]=array('class'=>$class, 'options'=>$options); } @@ -475,7 +475,7 @@ class Preview { * @brief create instances of all the registered preview providers * @return void */ - private static function initProviders(){ + private static function initProviders() { if(count(self::$providers)>0) { return; } @@ -497,7 +497,7 @@ class Preview { * @brief method that handles preview requests from users that are logged in * @return void */ - public static function previewRouter($params){ + public static function previewRouter($params) { \OC_Util::checkLoggedIn(); $file = ''; @@ -514,11 +514,11 @@ class Preview { if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - if($file !== '' && $maxX !== 0 && $maxY !== 0){ + if($file !== '' && $maxX !== 0 && $maxY !== 0) { try{ $preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); $preview->showPreview(); - }catch(Exception $e){ + }catch(Exception $e) { \OC_Response::setStatus(404); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; @@ -533,7 +533,7 @@ class Preview { * @brief method that handles preview requests from users that are not logged in / view shared folders that are public * @return void */ - public static function publicPreviewRouter($params){ + public static function publicPreviewRouter($params) { $file = ''; $maxX = 0; $maxY = 0; @@ -560,21 +560,21 @@ class Preview { //clean up file parameter $file = \OC\Files\Filesystem::normalizePath($file); - if(!\OC\Files\Filesystem::isValidPath($file)){ + if(!\OC\Files\Filesystem::isValidPath($file)) { \OC_Response::setStatus(403); exit; } $path = \OC\Files\Filesystem::normalizePath($path, false); - if(substr($path, 0, 1) == '/'){ + if(substr($path, 0, 1) == '/') { $path = substr($path, 1); } - if($userid !== null && $path !== null){ + if($userid !== null && $path !== null) { try{ $preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); $preview->showPreview(); - }catch(Exception $e){ + }catch(Exception $e) { \OC_Response::setStatus(404); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; @@ -585,13 +585,13 @@ class Preview { } } - public static function post_write($args){ + public static function post_write($args) { self::post_delete($args); } - public static function post_delete($args){ + public static function post_delete($args) { $path = $args['path']; - if(substr($path, 0, 1) == '/'){ + if(substr($path, 0, 1) == '/') { $path = substr($path, 1); } $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); diff --git a/lib/preview/images.php b/lib/preview/images.php index c62fc5397e5..933d65ec59e 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -10,16 +10,16 @@ namespace OC\Preview; class Image extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/image\/.*/'; } - public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { //get fileinfo $fileinfo = $fileview->getFileInfo($path); //check if file is encrypted - if($fileinfo['encrypted'] === true){ + if($fileinfo['encrypted'] === true) { $image = new \OC_Image($fileview->fopen($path, 'r')); }else{ $image = new \OC_Image(); diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 14ac97b552d..aa97c3f43fc 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -8,14 +8,14 @@ */ namespace OC\Preview; -if(!is_null(shell_exec('ffmpeg -version'))){ +if(!is_null(shell_exec('ffmpeg -version'))) { class Movie extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/video\/.*/'; } - public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { //get fileinfo $fileinfo = $fileview->getFileInfo($path); diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index d62c7230788..cfe78f32727 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -11,7 +11,7 @@ require_once('getid3/getid3.php'); class MP3 extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/audio\/mpeg/'; } @@ -33,7 +33,7 @@ class MP3 extends Provider{ return $image; } - public function getNoCoverThumbnail($maxX, $maxY){ + public function getNoCoverThumbnail($maxX, $maxY) { $image = new \OC_Image(); return $image; } diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 4dd4538545c..66570b05aa4 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -7,11 +7,11 @@ */ namespace OC\Preview; -if (extension_loaded('imagick')){ +if (extension_loaded('imagick')) { class PDF extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/application\/pdf/'; } diff --git a/lib/preview/provider.php b/lib/preview/provider.php index 1e8d537adc8..58e7ad7f453 100644 --- a/lib/preview/provider.php +++ b/lib/preview/provider.php @@ -18,5 +18,5 @@ abstract class Provider{ * @param string $query * @return */ - abstract public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview); + abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview); } diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 70be263189d..746315d6e6a 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -7,11 +7,11 @@ */ namespace OC\Preview; -if (extension_loaded('imagick')){ +if (extension_loaded('imagick')) { class SVG extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/image\/svg\+xml/'; } @@ -20,7 +20,7 @@ if (extension_loaded('imagick')){ $svg->setResolution($maxX, $maxY); $content = stream_get_contents($fileview->fopen($path, 'r')); - if(substr($content, 0, 5) !== '' . $content; } diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 4004ecd3fce..5961761aaa4 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -9,11 +9,11 @@ namespace OC\Preview; class TXT extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/text\/.*/'; } - public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { $content = $fileview->fopen($path, 'r'); $content = stream_get_contents($content); @@ -27,7 +27,7 @@ class TXT extends Provider{ $imagecolor = imagecolorallocate($image, 255, 255, 255); $textcolor = imagecolorallocate($image, 0, 0, 0); - foreach($lines as $index => $line){ + foreach($lines as $index => $line) { $index = $index + 1; $x = (int) 1; @@ -35,7 +35,7 @@ class TXT extends Provider{ imagestring($image, 1, $x, $y, $line, $textcolor); - if(($index * $linesize) >= $maxY){ + if(($index * $linesize) >= $maxY) { break; } } diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 6a8d2fbb75c..2977cd68923 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -10,11 +10,11 @@ namespace OC\Preview; class Unknown extends Provider{ - public function getMimeType(){ + public function getMimeType() { return '/.*/'; } - public function getThumbnail($path, $maxX, $maxY, $scalingup,$fileview) { + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { /*$mimetype = $fileview->getMimeType($path); $info = $fileview->getFileInfo($path); $name = array_key_exists('name', $info) ? $info['name'] : ''; -- cgit v1.2.3 From 6b90416891e9e0943a7b19f29017bf7d8140eb0a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 13:09:38 +0200 Subject: add php preview backend --- lib/preview/txt.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 5961761aaa4..def6806860b 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -48,4 +48,14 @@ class TXT extends Provider{ } } -\OC\Preview::registerProvider('OC\Preview\TXT'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\TXT'); + +class PHP extends TXT { + + public function getMimeType() { + return '/application\/x-php/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\PHP'); \ No newline at end of file -- cgit v1.2.3 From 1e252b67635aeed7fa8180a0868abd6442a3c42c Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 29 May 2013 13:11:43 +0200 Subject: more style fixes --- lib/preview/images.php | 2 +- lib/preview/movies.php | 3 ++- lib/preview/mp3.php | 4 ++-- lib/preview/pdf.php | 2 +- lib/preview/provider.php | 2 +- lib/preview/svg.php | 2 +- lib/preview/txt.php | 2 +- lib/preview/unknown.php | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index 933d65ec59e..080e424e5bd 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -8,7 +8,7 @@ */ namespace OC\Preview; -class Image extends Provider{ +class Image extends Provider { public function getMimeType() { return '/image\/.*/'; diff --git a/lib/preview/movies.php b/lib/preview/movies.php index aa97c3f43fc..18e9d4f778c 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -9,7 +9,8 @@ namespace OC\Preview; if(!is_null(shell_exec('ffmpeg -version'))) { - class Movie extends Provider{ + + class Movie extends Provider { public function getMimeType() { return '/video\/.*/'; diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index cfe78f32727..303626e022e 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -1,4 +1,4 @@ - Date: Wed, 29 May 2013 13:13:47 +0200 Subject: fix c&p fail --- lib/preview/mp3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 303626e022e..3c6be5c9226 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -1,4 +1,4 @@ -Provider{ Date: Thu, 30 May 2013 10:44:23 +0200 Subject: validate size of file --- lib/preview.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 1150681e64f..be3abc2cd47 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -87,7 +87,15 @@ class Preview { $this->maxY = $this->max_y; } } - + + $fileinfo = $this->fileview->getFileInfo($this->file); + if(array_key_exists('size', $fileinfo)){ + if((int) $fileinfo['size'] === 0){ + \OC_Log::write('core', 'You can\'t generate a preview of a 0 byte file (' . $this->file . ')', \OC_Log::ERROR); + throw new \Exception('0 byte file given'); + } + } + //init providers if(empty(self::$providers)) { self::initProviders(); @@ -518,7 +526,7 @@ class Preview { try{ $preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); $preview->showPreview(); - }catch(Exception $e) { + }catch(\Exception $e) { \OC_Response::setStatus(404); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; @@ -574,7 +582,7 @@ class Preview { try{ $preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); $preview->showPreview(); - }catch(Exception $e) { + }catch(\Exception $e) { \OC_Response::setStatus(404); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); exit; -- cgit v1.2.3 From a014662c52f5295a7e86cd43b7dd62b89e3f1085 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 30 May 2013 11:06:52 +0200 Subject: improve imagick error handling --- lib/preview/pdf.php | 9 +++++++-- lib/preview/svg.php | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 85878a122a8..f1d0a33dc63 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -19,8 +19,13 @@ if (extension_loaded('imagick')) { $tmppath = $fileview->toTmpFile($path); //create imagick object from pdf - $pdf = new \imagick($tmppath . '[0]'); - $pdf->setImageFormat('jpg'); + try{ + $pdf = new \imagick($tmppath . '[0]'); + $pdf->setImageFormat('jpg'); + }catch(\Exception $e){ + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + return false; + } unlink($tmppath); diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 8bceeaf60d1..76d81589bac 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -16,17 +16,22 @@ if (extension_loaded('imagick')) { } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $svg = new \Imagick(); - $svg->setResolution($maxX, $maxY); - - $content = stream_get_contents($fileview->fopen($path, 'r')); - if(substr($content, 0, 5) !== '' . $content; + try{ + $svg = new \Imagick(); + $svg->setResolution($maxX, $maxY); + + $content = stream_get_contents($fileview->fopen($path, 'r')); + if(substr($content, 0, 5) !== '' . $content; + } + + $svg->readImageBlob($content); + $svg->setImageFormat('jpg'); + }catch(\Exception $e){ + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + return false; } - $svg->readImageBlob($content); - $svg->setImageFormat('jpg'); - //new image object $image = new \OC_Image($svg); //check if image object is valid -- cgit v1.2.3 From b944b1c5d29393e1b6f0bc51cf50db6eba356e64 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 30 May 2013 11:12:12 +0200 Subject: add javascript preview backend --- lib/preview/txt.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 4eb0e820406..f18da66c3b8 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -58,4 +58,14 @@ class PHP extends TXT { } -\OC\Preview::registerProvider('OC\Preview\PHP'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\PHP'); + +class JavaScript extends TXT { + + public function getMimeType() { + return '/application\/javascript/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file -- cgit v1.2.3 From f7c80a391d192a15d594c3eaf7909a3d78df1a29 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 30 May 2013 15:29:38 +0200 Subject: load getID3 only if needed --- lib/preview/mp3.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 3c6be5c9226..660e9fc3ce4 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -7,8 +7,6 @@ */ namespace OC\Preview; -require_once('getid3/getid3.php'); - class MP3 extends Provider { public function getMimeType() { @@ -16,6 +14,8 @@ class MP3 extends Provider { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + require_once('getid3/getid3.php'); + $getID3 = new \getID3(); $tmppath = $fileview->toTmpFile($path); -- cgit v1.2.3 From a11a40d9a96685d41e5acae096752f16785b16b5 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 31 May 2013 12:23:51 +0200 Subject: add backend for microsoft office 2007 documents --- lib/preview.php | 2 + lib/preview/msoffice.php | 109 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 lib/preview/msoffice.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index be3abc2cd47..a73f4cb1ac0 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -20,6 +20,8 @@ require_once('preview/pdf.php'); require_once('preview/svg.php'); require_once('preview/txt.php'); require_once('preview/unknown.php'); +require_once('preview/msoffice.php'); +//require_once('preview/opendocument.php'); class Preview { //the thumbnail folder diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php new file mode 100644 index 00000000000..c99ca313c72 --- /dev/null +++ b/lib/preview/msoffice.php @@ -0,0 +1,109 @@ +toTmpFile($path); + + $transformdoc = new \TransformDoc(); + $transformdoc->setStrFile($tmpdoc); + $transformdoc->generatePDF($tmpdoc); + + $pdf = new \imagick($tmpdoc . '[0]'); + $pdf->setImageFormat('jpg'); + + unlink($tmpdoc); + + //new image object + $image = new \OC_Image($pdf); + //check if image object is valid + if (!$image->valid()) return false; + + return $image; + } +} + +class DOC extends MSOffice2003 { + + public function getMimeType() { + return '/application\/msword/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\DOC'); + +class DOCX extends MSOffice2007 { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.wordprocessingml.document/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\DOCX'); + +class XLS extends MSOffice2003 { + + public function getMimeType() { + return '/application\/vnd.ms-excel/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\XLS'); + +class XLSX extends MSOffice2007 { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\XLSX'); + +class PPT extends MSOffice2003 { + + public function getMimeType() { + return '/application\/vnd.ms-powerpoint/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\PPT'); + +class PPTX extends MSOffice2007 { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\PPTX'); \ No newline at end of file -- cgit v1.2.3 From 34decf357697a81c23e844ef606c04a20a08c597 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 3 Jun 2013 11:24:31 +0200 Subject: save current work state --- lib/preview.php | 2 +- lib/preview/libreoffice-cl.php | 0 lib/preview/office.php | 13 +++++++++++++ lib/preview/opendocument.php | 0 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lib/preview/libreoffice-cl.php create mode 100644 lib/preview/office.php create mode 100644 lib/preview/opendocument.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index a73f4cb1ac0..4705efe2107 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -20,7 +20,7 @@ require_once('preview/pdf.php'); require_once('preview/svg.php'); require_once('preview/txt.php'); require_once('preview/unknown.php'); -require_once('preview/msoffice.php'); +//require_once('preview/msoffice.php'); //require_once('preview/opendocument.php'); class Preview { diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/preview/office.php b/lib/preview/office.php new file mode 100644 index 00000000000..c66f5584f07 --- /dev/null +++ b/lib/preview/office.php @@ -0,0 +1,13 @@ + Date: Wed, 5 Jun 2013 10:50:20 +0200 Subject: save current work state of libreoffice preview backend --- lib/preview/libreoffice-cl.php | 129 +++++++++++++++++++++++++++++++++++++++++ lib/preview/office.php | 4 +- 2 files changed, 132 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index e69de29bb2d..1408e69e8cf 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -0,0 +1,129 @@ +initCmd(); + if(is_null($this->cmd)) { + return false; + } + + $abspath = $fileview->toTmpFile($path); + + chdir(get_temp_dir()); + + $exec = 'libreoffice --headless -convert-to pdf ' . escapeshellarg($abspath); + exec($exec) + + //create imagick object from pdf + try{ + $pdf = new \imagick($abspath . '.pdf' . '[0]'); + $pdf->setImageFormat('jpg'); + }catch(\Exception $e){ + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + return false; + } + + $image = new \OC_Image($pdf); + + unlink($abspath); + unlink($tmppath); + if (!$image->valid()) return false; + + return $image; + } + + private function initCmd() { + $cmd = ''; + + if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { + $cmd = \OC_Config::getValue('preview_libreoffice_path', null); + } + + if($cmd === '' && shell_exec('libreoffice --headless --version')) { + $cmd = 'libreoffice'; + } + + if($cmd === '' && shell_exec('openoffice --headless --version')) { + $cmd = 'openoffice'; + } + + if($cmd === '') { + $cmd = null; + } + + $this->cmd = $cmd; + } + } +} + +//.doc, .dot +class MSOfficeDoc extends Office { + + public function getMimeType() { + return '/application\/msword/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc'); + +//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) +class MSOffice2003 extends Office { + + public function getMimeType() { + return '/application\/vnd.ms-.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOffice2003'); + +//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx +class MSOffice2007 extends Office { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOffice2007'); + +//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt +class OpenDocument extends Office { + + public function getMimeType() { + return '/application\/vnd.oasis.opendocument.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\OpenDocument'); + +//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm +class StarOffice extends Office { + + public function getMimeType() { + return '/application\/vnd.sun.xml.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file diff --git a/lib/preview/office.php b/lib/preview/office.php index c66f5584f07..cc1addf3996 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -5,9 +5,11 @@ * later. * See the COPYING-README file. */ -if(shell_exec('libreoffice') || shell_exec('openoffice')) { +//let's see if there is libreoffice or openoffice on this machine +if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { require_once('libreoffice-cl.php'); }else{ + //in case there isn't, use our fallback require_once('msoffice.php'); require_once('opendocument.php'); } \ No newline at end of file -- cgit v1.2.3 From 749c33f39d9452e2c1fdca718e3abcdb7c4a9dd0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 10:53:16 +0200 Subject: escape tmppath shell arg --- lib/preview/movies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 18e9d4f778c..8cd50263e2a 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -24,7 +24,7 @@ if(!is_null(shell_exec('ffmpeg -version'))) { $tmppath = \OC_Helper::tmpFile(); //$cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; - $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . $tmppath; + $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath); shell_exec($cmd); unlink($abspath); -- cgit v1.2.3 From f437673f1a03ba5b2eeb3e79d24bf6ad3265aa0b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 10:55:57 +0200 Subject: update require_once block in preview.php --- lib/preview.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 4705efe2107..f9f1288cb98 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -20,8 +20,7 @@ require_once('preview/pdf.php'); require_once('preview/svg.php'); require_once('preview/txt.php'); require_once('preview/unknown.php'); -//require_once('preview/msoffice.php'); -//require_once('preview/opendocument.php'); +require_once('preview/office.php'); class Preview { //the thumbnail folder -- cgit v1.2.3 From bab8b20cbdc65888d92477f9a5810ea4b114ada1 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 11:06:36 +0200 Subject: use ->cmd instead of hardcoded libreoffice --- lib/preview/libreoffice-cl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 1408e69e8cf..49c574c9521 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -28,7 +28,7 @@ if (extension_loaded('imagick')) { chdir(get_temp_dir()); - $exec = 'libreoffice --headless -convert-to pdf ' . escapeshellarg($abspath); + $exec = $this->cmd . ' --headless -convert-to pdf ' . escapeshellarg($abspath); exec($exec) //create imagick object from pdf -- cgit v1.2.3 From 8c5fceba296ae76a0f22f3ed0324dec46ef16019 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 11:13:13 +0200 Subject: fix syntax error --- lib/preview/libreoffice-cl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 49c574c9521..1b8e482fb23 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -29,7 +29,7 @@ if (extension_loaded('imagick')) { chdir(get_temp_dir()); $exec = $this->cmd . ' --headless -convert-to pdf ' . escapeshellarg($abspath); - exec($exec) + exec($exec); //create imagick object from pdf try{ -- cgit v1.2.3 From 21cc4f6960618c41e81ca7e785a6d9e21c21ecf9 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 12:44:31 +0200 Subject: make libreoffice preview backend work :D --- lib/preview/libreoffice-cl.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 1b8e482fb23..5121a4c5a08 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -26,11 +26,13 @@ if (extension_loaded('imagick')) { $abspath = $fileview->toTmpFile($path); - chdir(get_temp_dir()); + $tmpdir = get_temp_dir(); + + $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpdir) . ' ' . escapeshellarg($abspath); + $export = 'export HOME=/tmp'; + + shell_exec($export . "\n" . $exec); - $exec = $this->cmd . ' --headless -convert-to pdf ' . escapeshellarg($abspath); - exec($exec); - //create imagick object from pdf try{ $pdf = new \imagick($abspath . '.pdf' . '[0]'); @@ -43,7 +45,8 @@ if (extension_loaded('imagick')) { $image = new \OC_Image($pdf); unlink($abspath); - unlink($tmppath); + unlink($abspath . '.pdf'); + if (!$image->valid()) return false; return $image; -- cgit v1.2.3 From f80aba48935e7325effaa65f899922927157028a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 5 Jun 2013 12:58:39 +0200 Subject: use tmpdir var instead of hardcoded /tmp --- lib/preview/libreoffice-cl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 5121a4c5a08..33fa7a04e5d 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -29,7 +29,7 @@ if (extension_loaded('imagick')) { $tmpdir = get_temp_dir(); $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpdir) . ' ' . escapeshellarg($abspath); - $export = 'export HOME=/tmp'; + $export = 'export HOME=/' . $tmpdir; shell_exec($export . "\n" . $exec); -- cgit v1.2.3 From 25e8ac1c2f51e7f3f35eaec013aa1b3f8356f17b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 10 Jun 2013 11:01:12 +0200 Subject: implement previews for single shared files --- lib/preview.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index f9f1288cb98..904689bc4e1 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -557,31 +557,40 @@ class Preview { if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - + $linkItem = \OCP\Share::getShareByToken($token); - + if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { $userid = $linkItem['uid_owner']; \OC_Util::setupFS($userid); + $pathid = $linkItem['file_source']; $path = \OC\Files\Filesystem::getPath($pathid); - } - - //clean up file parameter - $file = \OC\Files\Filesystem::normalizePath($file); - if(!\OC\Files\Filesystem::isValidPath($file)) { - \OC_Response::setStatus(403); - exit; - } + $pathinfo = \OC\Files\Filesystem::getFileInfo($path); + + $sharedfile = null; + if($linkItem['item_type'] === 'folder') { + //clean up file parameter + $sharedfile = \OC\Files\Filesystem::normalizePath($file); + if(!\OC\Files\Filesystem::isValidPath($file)) { + \OC_Response::setStatus(403); + exit; + } + } else if($linkItem['item_type'] === 'file') { + $parent = $pathinfo['parent']; + $path = \OC\Files\Filesystem::getPath($parent); + $sharedfile = $pathinfo['name']; + } - $path = \OC\Files\Filesystem::normalizePath($path, false); - if(substr($path, 0, 1) == '/') { - $path = substr($path, 1); + $path = \OC\Files\Filesystem::normalizePath($path, false); + if(substr($path, 0, 1) == '/') { + $path = substr($path, 1); + } } - if($userid !== null && $path !== null) { + if($userid !== null && $path !== null && $sharedfile !== null) { try{ - $preview = new Preview($userid, 'files/' . $path, $file, $maxX, $maxY, $scalingup); + $preview = new Preview($userid, 'files/' . $path, $sharedfile, $maxX, $maxY, $scalingup); $preview->showPreview(); }catch(\Exception $e) { \OC_Response::setStatus(404); -- cgit v1.2.3 From 0e4f5001d5143f55a9d051b501fe32de900917c5 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 11 Jun 2013 10:45:50 +0200 Subject: don't crop Y axis --- lib/preview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 904689bc4e1..ed33e7b09dc 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -427,7 +427,8 @@ class Preview { if($newXsize >= $x && $newYsize >= $y) { $cropX = floor(abs($x - $newXsize) * 0.5); - $cropY = floor(abs($y - $newYsize) * 0.5); + //$cropY = floor(abs($y - $newYsize) * 0.5); + $cropY = 0; $image->crop($cropX, $cropY, $x, $y); -- cgit v1.2.3 From 2ff97917e9e72b674de07ca05dc04dd3bea14f07 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 11 Jun 2013 10:56:16 +0200 Subject: code optimization --- lib/preview/images.php | 5 +---- lib/preview/movies.php | 5 ++--- lib/preview/mp3.php | 4 +--- lib/preview/pdf.php | 4 +--- lib/preview/svg.php | 4 +--- lib/preview/txt.php | 4 +--- 6 files changed, 7 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index 080e424e5bd..e4041538e92 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -26,10 +26,7 @@ class Image extends Provider { $image->loadFromFile($fileview->getLocalFile($path)); } - //check if image object is valid - if (!$image->valid()) return false; - - return $image; + return $image->valid() ? $image : false; } } diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 8cd50263e2a..cb959a962a7 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -27,14 +27,13 @@ if(!is_null(shell_exec('ffmpeg -version'))) { $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath); shell_exec($cmd); - unlink($abspath); $image = new \OC_Image($tmppath); - if (!$image->valid()) return false; + unlink($abspath); unlink($tmppath); - return $image; + return $image->valid() ? $image : false; } } diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 660e9fc3ce4..60dfb5ff461 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -28,9 +28,7 @@ class MP3 extends Provider { unlink($tmppath); $image = new \OC_Image($picture); - if (!$image->valid()) return $this->getNoCoverThumbnail($maxX, $maxY); - - return $image; + return $image->valid() ? $image : $this->getNoCoverThumbnail($maxX, $maxY); } public function getNoCoverThumbnail($maxX, $maxY) { diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index f1d0a33dc63..3eabd201156 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -32,9 +32,7 @@ if (extension_loaded('imagick')) { //new image object $image = new \OC_Image($pdf); //check if image object is valid - if (!$image->valid()) return false; - - return $image; + return $image->valid() ? $image : false; } } diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 76d81589bac..bafaf71b15a 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -35,9 +35,7 @@ if (extension_loaded('imagick')) { //new image object $image = new \OC_Image($svg); //check if image object is valid - if (!$image->valid()) return false; - - return $image; + return $image->valid() ? $image : false; } } diff --git a/lib/preview/txt.php b/lib/preview/txt.php index f18da66c3b8..c7b8fabc6b0 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -42,9 +42,7 @@ class TXT extends Provider { $image = new \OC_Image($image); - if (!$image->valid()) return false; - - return $image; + return $image->valid() ? $image : false; } } -- cgit v1.2.3 From 28cf63d37d6a2b90ae32a2b5b7193a5f5c69830d Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 11 Jun 2013 11:00:44 +0200 Subject: check if imagick is loaded in office.php, not in libreoffice-cl.php --- lib/preview/libreoffice-cl.php | 87 ++++++++++++++++++++---------------------- lib/preview/office.php | 17 +++++---- 2 files changed, 51 insertions(+), 53 deletions(-) (limited to 'lib') diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 33fa7a04e5d..2749c4867e9 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -8,71 +8,66 @@ namespace OC\Preview; //we need imagick to convert -if (extension_loaded('imagick')) { +class Office extends Provider { - class Office extends Provider { + private $cmd; - private $cmd; + public function getMimeType() { + return null; + } - public function getMimeType() { - return null; + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $this->initCmd(); + if(is_null($this->cmd)) { + return false; } - public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $this->initCmd(); - if(is_null($this->cmd)) { - return false; - } + $abspath = $fileview->toTmpFile($path); - $abspath = $fileview->toTmpFile($path); + $tmpdir = get_temp_dir(); - $tmpdir = get_temp_dir(); + $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpdir) . ' ' . escapeshellarg($abspath); + $export = 'export HOME=/' . $tmpdir; - $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpdir) . ' ' . escapeshellarg($abspath); - $export = 'export HOME=/' . $tmpdir; + shell_exec($export . "\n" . $exec); - shell_exec($export . "\n" . $exec); + //create imagick object from pdf + try{ + $pdf = new \imagick($abspath . '.pdf' . '[0]'); + $pdf->setImageFormat('jpg'); + }catch(\Exception $e){ + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + return false; + } - //create imagick object from pdf - try{ - $pdf = new \imagick($abspath . '.pdf' . '[0]'); - $pdf->setImageFormat('jpg'); - }catch(\Exception $e){ - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - return false; - } + $image = new \OC_Image($pdf); - $image = new \OC_Image($pdf); + unlink($abspath); + unlink($abspath . '.pdf'); - unlink($abspath); - unlink($abspath . '.pdf'); + return $image->valid() ? $image : false; + } - if (!$image->valid()) return false; + private function initCmd() { + $cmd = ''; - return $image; + if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { + $cmd = \OC_Config::getValue('preview_libreoffice_path', null); } - private function initCmd() { - $cmd = ''; - - if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { - $cmd = \OC_Config::getValue('preview_libreoffice_path', null); - } - - if($cmd === '' && shell_exec('libreoffice --headless --version')) { - $cmd = 'libreoffice'; - } - - if($cmd === '' && shell_exec('openoffice --headless --version')) { - $cmd = 'openoffice'; - } + if($cmd === '' && shell_exec('libreoffice --headless --version')) { + $cmd = 'libreoffice'; + } - if($cmd === '') { - $cmd = null; - } + if($cmd === '' && shell_exec('openoffice --headless --version')) { + $cmd = 'openoffice'; + } - $this->cmd = $cmd; + if($cmd === '') { + $cmd = null; } + + $this->cmd = $cmd; } } diff --git a/lib/preview/office.php b/lib/preview/office.php index cc1addf3996..20f545ef337 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -5,11 +5,14 @@ * later. * See the COPYING-README file. */ -//let's see if there is libreoffice or openoffice on this machine -if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { - require_once('libreoffice-cl.php'); -}else{ - //in case there isn't, use our fallback - require_once('msoffice.php'); - require_once('opendocument.php'); +//both, libreoffice backend and php fallback, need imagick +if (extension_loaded('imagick')) { + //let's see if there is libreoffice or openoffice on this machine + if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { + require_once('libreoffice-cl.php'); + }else{ + //in case there isn't, use our fallback + require_once('msoffice.php'); + require_once('opendocument.php'); + } } \ No newline at end of file -- cgit v1.2.3 From 67816da0bfe16ecb58d3a3bdb70c1fb9a79cff75 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 11 Jun 2013 13:15:24 +0200 Subject: save current work state of office fallback --- lib/preview/msoffice.php | 95 ++++++++++++++++++++++++++++++++------------ lib/preview/opendocument.php | 12 ++++++ 2 files changed, 81 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index c99ca313c72..4fedb735c95 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -7,22 +7,24 @@ */ namespace OC\Preview; -class MSOffice2003 extends Provider { +class DOC extends Provider { - public function getMimeType(){ - return null; + public function getMimeType() { + return '/application\/msword/'; } - public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview){ - return false; + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + } + } +\OC\Preview::registerProvider('OC\Preview\DOC'); -class MSOffice2007 extends Provider { +class DOCX extends Provider { - public function getMimeType(){ - return null; + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.wordprocessingml.document/'; } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { @@ -39,36 +41,50 @@ class MSOffice2007 extends Provider { unlink($tmpdoc); - //new image object $image = new \OC_Image($pdf); - //check if image object is valid - if (!$image->valid()) return false; - - return $image; + + return $image->valid() ? $image : false; } + } -class DOC extends MSOffice2003 { +\OC\Preview::registerProvider('OC\Preview\DOCX'); + +class MSOfficeExcel extends Provider { public function getMimeType() { - return '/application\/msword/'; + return null; } -} + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + require_once('PHPExcel/Classes/PHPExcel.php'); + require_once('PHPExcel/Classes/PHPExcel/IOFactory.php'); + //require_once('mpdf/mpdf.php'); -\OC\Preview::registerProvider('OC\Preview\DOC'); + $abspath = $fileview->toTmpFile($path); + $tmppath = \OC_Helper::tmpFile(); -class DOCX extends MSOffice2007 { + $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF; + $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/dompdf'; - public function getMimeType() { - return '/application\/vnd.openxmlformats-officedocument.wordprocessingml.document/'; + \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath); + + $phpexcel = new \PHPExcel($abspath); + $excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF'); + $excel->save($tmppath); + + $pdf = new \imagick($tmppath . '[0]'); + $pdf->setImageFormat('jpg'); + + unlink($abspath); + unlink($tmppath); + + return $image->valid() ? $image : false; } } -\OC\Preview::registerProvider('OC\Preview\DOCX'); - -class XLS extends MSOffice2003 { +class XLS extends MSOfficeExcel { public function getMimeType() { return '/application\/vnd.ms-excel/'; @@ -78,7 +94,7 @@ class XLS extends MSOffice2003 { \OC\Preview::registerProvider('OC\Preview\XLS'); -class XLSX extends MSOffice2007 { +class XLSX extends MSOfficeExcel { public function getMimeType() { return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/'; @@ -88,7 +104,34 @@ class XLSX extends MSOffice2007 { \OC\Preview::registerProvider('OC\Preview\XLSX'); -class PPT extends MSOffice2003 { +class MSOfficePowerPoint extends Provider { + + public function getMimeType() { + return null; + } + + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + //require_once(''); + //require_once(''); + + $abspath = $fileview->toTmpFile($path); + $tmppath = \OC_Helper::tmpFile(); + + $excel = PHPPowerPoint_IOFactory::createWriter($abspath, 'PDF'); + $excel->save($tmppath); + + $pdf = new \imagick($tmppath . '[0]'); + $pdf->setImageFormat('jpg'); + + unlink($abspath); + unlink($tmppath); + + return $image->valid() ? $image : false; + } + +} + +class PPT extends MSOfficePowerPoint { public function getMimeType() { return '/application\/vnd.ms-powerpoint/'; @@ -98,7 +141,7 @@ class PPT extends MSOffice2003 { \OC\Preview::registerProvider('OC\Preview\PPT'); -class PPTX extends MSOffice2007 { +class PPTX extends MSOfficePowerPoint { public function getMimeType() { return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/'; diff --git a/lib/preview/opendocument.php b/lib/preview/opendocument.php index e69de29bb2d..786a038ff82 100644 --- a/lib/preview/opendocument.php +++ b/lib/preview/opendocument.php @@ -0,0 +1,12 @@ + Date: Wed, 12 Jun 2013 11:40:01 +0200 Subject: finish implementation of Excel preview fallback --- lib/preview/msoffice.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index 4fedb735c95..c2e39d00d94 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -42,7 +42,7 @@ class DOCX extends Provider { unlink($tmpdoc); $image = new \OC_Image($pdf); - + return $image->valid() ? $image : false; } @@ -65,7 +65,7 @@ class MSOfficeExcel extends Provider { $tmppath = \OC_Helper::tmpFile(); $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF; - $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/dompdf'; + $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf'; \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath); @@ -79,6 +79,8 @@ class MSOfficeExcel extends Provider { unlink($abspath); unlink($tmppath); + $image = new \OC_Image($pdf); + return $image->valid() ? $image : false; } -- cgit v1.2.3 From 1f52ad0363e2cff05e2058d31317b580c27e2c31 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 12 Jun 2013 13:20:59 +0200 Subject: work on powerpoint fallback --- lib/preview/msoffice.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index c2e39d00d94..65886169e9a 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -59,7 +59,6 @@ class MSOfficeExcel extends Provider { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { require_once('PHPExcel/Classes/PHPExcel.php'); require_once('PHPExcel/Classes/PHPExcel/IOFactory.php'); - //require_once('mpdf/mpdf.php'); $abspath = $fileview->toTmpFile($path); $tmppath = \OC_Helper::tmpFile(); @@ -113,14 +112,12 @@ class MSOfficePowerPoint extends Provider { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - //require_once(''); - //require_once(''); + return false; $abspath = $fileview->toTmpFile($path); $tmppath = \OC_Helper::tmpFile(); - $excel = PHPPowerPoint_IOFactory::createWriter($abspath, 'PDF'); - $excel->save($tmppath); + null; $pdf = new \imagick($tmppath . '[0]'); $pdf->setImageFormat('jpg'); @@ -128,6 +125,8 @@ class MSOfficePowerPoint extends Provider { unlink($abspath); unlink($tmppath); + $image = new \OC_Image($pdf); + return $image->valid() ? $image : false; } -- cgit v1.2.3 From f89a23b463884e1a9b89c84fdcb1c34afba62645 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 12 Jun 2013 16:18:16 +0200 Subject: implement unknown preview backend --- lib/preview/unknown.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 6b161424917..6e1dc06c1bc 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -15,12 +15,24 @@ class Unknown extends Provider { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - /*$mimetype = $fileview->getMimeType($path); - $info = $fileview->getFileInfo($path); - $name = array_key_exists('name', $info) ? $info['name'] : ''; - $size = array_key_exists('size', $info) ? $info['size'] : 0; - $isencrypted = array_key_exists('encrypted', $info) ? $info['encrypted'] : false;*/ // show little lock - return new \OC_Image(); + $mimetype = $fileview->getMimeType($path); + if(substr_count($mimetype, '/')) { + list($type, $subtype) = explode('/', $mimetype); + } + + $iconsroot = \OC::$SERVERROOT . '/core/img/filetypes/'; + + $icons = array($mimetype, $type, 'text'); + foreach($icons as $icon) { + $icon = str_replace('/', '-', $icon); + + $iconpath = $iconsroot . $icon . '.png'; + + if(file_exists($iconpath)) { + return new \OC_Image($iconpath); + } + } + return false; } } -- cgit v1.2.3 From 25981a079a185080ad3ca2d2a23dd827efbd9d05 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 13 Jun 2013 09:52:39 +0200 Subject: some whitespace fixes --- lib/preview.php | 11 ++++++----- lib/preview/unknown.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index ed33e7b09dc..3564fe3df44 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -41,6 +41,7 @@ class Preview { private $maxY; private $scalingup; + //preview images object private $preview; //preview providers @@ -81,7 +82,7 @@ class Preview { $this->maxX = $this->max_x; } } - + if(!is_null($this->max_y)) { if($this->maxY > $this->max_y) { \OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, \OC_Log::DEBUG); @@ -101,25 +102,25 @@ class Preview { if(empty(self::$providers)) { self::initProviders(); } - + //check if there are any providers at all if(empty(self::$providers)) { \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); throw new \Exception('No providers'); } - + //validate parameters if($file === '') { \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); throw new \Exception('File not found'); } - + //check if file exists if(!$this->fileview->file_exists($file)) { \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); throw new \Exception('File not found'); } - + //check if given size makes sense if($maxX === 0 || $maxY === 0) { \OC_Log::write('core', 'Can not create preview with 0px width or 0px height', \OC_Log::ERROR); diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 6e1dc06c1bc..4e1ca7de741 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -36,4 +36,4 @@ class Unknown extends Provider { } } -\OC\Preview::registerProvider('OC\Preview\Unknown'); +\OC\Preview::registerProvider('OC\Preview\Unknown'); \ No newline at end of file -- cgit v1.2.3 From 6082a0649cefd356370d4ca8034041c1af3875ff Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 17 Jun 2013 12:27:26 +0200 Subject: stream first mb of movie to create preview --- lib/preview/movies.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index cb959a962a7..8531050d112 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -17,17 +17,19 @@ if(!is_null(shell_exec('ffmpeg -version'))) { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - //get fileinfo - $fileinfo = $fileview->getFileInfo($path); - - $abspath = $fileview->toTmpFile($path); + $abspath = \OC_Helper::tmpFile(); $tmppath = \OC_Helper::tmpFile(); + $handle = $fileview->fopen($path, 'rb'); + + $firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576 + file_put_contents($abspath, $firstmb); + //$cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; - $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath); + $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath); + shell_exec($cmd); - $image = new \OC_Image($tmppath); unlink($abspath); -- cgit v1.2.3 From bea4376fd48e714b121e1abb54f9bd786e89c877 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 18 Jun 2013 11:04:08 +0200 Subject: remove opendocument.php --- lib/preview/office.php | 1 - lib/preview/opendocument.php | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 lib/preview/opendocument.php (limited to 'lib') diff --git a/lib/preview/office.php b/lib/preview/office.php index 20f545ef337..b6783bc5798 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -13,6 +13,5 @@ if (extension_loaded('imagick')) { }else{ //in case there isn't, use our fallback require_once('msoffice.php'); - require_once('opendocument.php'); } } \ No newline at end of file diff --git a/lib/preview/opendocument.php b/lib/preview/opendocument.php deleted file mode 100644 index 786a038ff82..00000000000 --- a/lib/preview/opendocument.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Tue, 18 Jun 2013 13:53:02 +0200 Subject: use ppt icon instead of preview --- lib/preview/msoffice.php | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index 65886169e9a..262582f0216 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -14,7 +14,7 @@ class DOC extends Provider { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - + require_once(); } } @@ -105,6 +105,7 @@ class XLSX extends MSOfficeExcel { \OC\Preview::registerProvider('OC\Preview\XLSX'); +/* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ... class MSOfficePowerPoint extends Provider { public function getMimeType() { @@ -113,21 +114,6 @@ class MSOfficePowerPoint extends Provider { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { return false; - - $abspath = $fileview->toTmpFile($path); - $tmppath = \OC_Helper::tmpFile(); - - null; - - $pdf = new \imagick($tmppath . '[0]'); - $pdf->setImageFormat('jpg'); - - unlink($abspath); - unlink($tmppath); - - $image = new \OC_Image($pdf); - - return $image->valid() ? $image : false; } } @@ -150,4 +136,5 @@ class PPTX extends MSOfficePowerPoint { } -\OC\Preview::registerProvider('OC\Preview\PPTX'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\PPTX'); +*/ \ No newline at end of file -- cgit v1.2.3 From 1fcbf8dd7ac69bfce888cc61084a72919503fd05 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 19 Jun 2013 10:21:55 +0200 Subject: implemenet getNoCoverThumbnail --- lib/preview/mp3.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 60dfb5ff461..835ff529000 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -20,7 +20,6 @@ class MP3 extends Provider { $tmppath = $fileview->toTmpFile($path); - //Todo - add stream support $tags = $getID3->analyze($tmppath); \getid3_lib::CopyTagsToComments($tags); $picture = @$tags['id3v2']['APIC'][0]['data']; @@ -32,8 +31,14 @@ class MP3 extends Provider { } public function getNoCoverThumbnail($maxX, $maxY) { - $image = new \OC_Image(); - return $image; + $icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png'; + + if(!file_exists($icon)) { + return false; + } + + $image = new \OC_Image($icon); + return $image->valid() ? $image : false; } } -- cgit v1.2.3 From fb67b458412241cb91c01bdb339d1a4317aeacab Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 19 Jun 2013 13:40:57 +0200 Subject: comment out old code --- lib/preview/msoffice.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index 262582f0216..ccf1d674c7a 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -7,6 +7,7 @@ */ namespace OC\Preview; +/* //There is no (good) php-only solution for converting 2003 word documents to pdfs / pngs ... class DOC extends Provider { public function getMimeType() { @@ -14,12 +15,13 @@ class DOC extends Provider { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - require_once(); + require_once(''); } } \OC\Preview::registerProvider('OC\Preview\DOC'); +*/ class DOCX extends Provider { -- cgit v1.2.3 From a98391b976ba7dd544af6a0d16b324efb2fc7a3c Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 26 Jun 2013 10:57:37 +0200 Subject: some minor improvements to preview lib --- lib/preview.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 3564fe3df44..87e2e78d1d8 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -323,7 +323,7 @@ class Preview { }else{ $mimetype = $this->fileview->getMimeType($file); - $preview; + $preview = null; foreach(self::$providers as $supportedmimetype => $provider) { if(!preg_match($supportedmimetype, $mimetype)) { @@ -350,6 +350,11 @@ class Preview { break; } + + if(is_null($preview) || $preview === false) { + $preview = new \OC_Image(); + } + $this->preview = $preview; } $this->resizeAndCrop(); -- cgit v1.2.3 From 9b7efef39d3f7eae45741f0adf0bc0d52945d842 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 26 Jun 2013 14:28:40 +0200 Subject: improve Image Provider --- lib/preview/images.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/images.php b/lib/preview/images.php index e4041538e92..987aa9aef0a 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -20,7 +20,7 @@ class Image extends Provider { //check if file is encrypted if($fileinfo['encrypted'] === true) { - $image = new \OC_Image($fileview->fopen($path, 'r')); + $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r'))); }else{ $image = new \OC_Image(); $image->loadFromFile($fileview->getLocalFile($path)); -- cgit v1.2.3 From 39c387eed4e5da7bddb6f7cd48a8f8b607f3b8dd Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 26 Jun 2013 18:04:18 +0200 Subject: implement server side use of previews --- apps/files/templates/part.list.php | 3 ++- lib/helper.php | 11 +++++++++++ lib/public/template.php | 9 +++++++++ lib/template.php | 12 ++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 1e94275dcba..6dabd7d6970 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -1,6 +1,7 @@ style="background-image:url()" - style="background-image:url()" + style="background-image:url()" > diff --git a/lib/helper.php b/lib/helper.php index a315c640d1a..e8cc81774dd 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -223,6 +223,17 @@ class OC_Helper { } } + /** + * @brief get path to preview of file + * @param string $path path + * @return string the url + * + * Returns the path to the preview of the file. + */ + public static function previewIcon($path) { + return self::linkToRoute( 'core_ajax_preview', array('x' => 32, 'y' => 32, 'file' => $path)); + } + /** * @brief Make a human file size * @param int $bytes file size in bytes diff --git a/lib/public/template.php b/lib/public/template.php index ccf19cf052c..5f9888f9f28 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -54,6 +54,15 @@ function mimetype_icon( $mimetype ) { return(\mimetype_icon( $mimetype )); } +/** + * @brief make preview_icon available as a simple function + * Returns the path to the preview of the image. + * @param $path path of file + * @returns link to the preview + */ +function preview_icon( $path ) { + return(\preview_icon( $path )); +} /** * @brief make OC_Helper::humanFileSize available as a simple function diff --git a/lib/template.php b/lib/template.php index ae9ea187445..048d172f1c9 100644 --- a/lib/template.php +++ b/lib/template.php @@ -62,6 +62,18 @@ function image_path( $app, $image ) { return OC_Helper::imagePath( $app, $image ); } +/** + * @brief make preview_icon available as a simple function + * Returns the path to the preview of the image. + * @param $path path of file + * @returns link to the preview + * + * For further information have a look at OC_Helper::previewIcon + */ +function preview_icon( $path ) { + return OC_Helper::previewIcon( $path ); +} + /** * @brief make OC_Helper::mimetypeIcon available as a simple function * @param string $mimetype mimetype -- cgit v1.2.3 From 806f3bddecbd8182f1da90ec91e2a03a1a6e2c3b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 26 Jun 2013 18:19:10 +0200 Subject: increase size of preview to size of row --- apps/files/css/files.css | 2 +- lib/helper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/apps/files/css/files.css b/apps/files/css/files.css index be29186cbb7..222cc9c83ef 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -118,7 +118,7 @@ table td.filename a.name { } table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; } table td.filename input.filename { width:100%; cursor:text; } -table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; } +table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; } table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; } .modified { position: absolute; diff --git a/lib/helper.php b/lib/helper.php index e8cc81774dd..0a8962a5312 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -231,7 +231,7 @@ class OC_Helper { * Returns the path to the preview of the file. */ public static function previewIcon($path) { - return self::linkToRoute( 'core_ajax_preview', array('x' => 32, 'y' => 32, 'file' => $path)); + return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => $path)); } /** -- cgit v1.2.3 From 57370353ad1b21156094adc3d1e735582bbd2bb0 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 28 Jun 2013 19:22:51 +0200 Subject: Check if the app is enabled and the app path is found before trying to load the script file --- lib/base.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index fd4870974fe..af0a30ea173 100644 --- a/lib/base.php +++ b/lib/base.php @@ -661,12 +661,15 @@ class OC { $app = $param['app']; $file = $param['file']; $app_path = OC_App::getAppPath($app); - $file = $app_path . '/' . $file; - unset($app, $app_path); - if (file_exists($file)) { - require_once $file; - return true; + if (OC_App::isEnabled($app) && $app_path !== false) { + $file = $app_path . '/' . $file; + unset($app, $app_path); + if (file_exists($file)) { + require_once $file; + return true; + } } + header('HTTP/1.0 404 Not Found'); return false; } -- cgit v1.2.3 From 04292ff16c56d85216ddbd6f644e8055413c0170 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 8 Jul 2013 10:53:53 +0200 Subject: implement use of preview icons in thrashbin app --- apps/files_trashbin/lib/trash.php | 4 ++++ apps/files_trashbin/templates/part.list.php | 2 +- core/routes.php | 2 ++ lib/preview.php | 35 +++++++++++++++++++++++++---- 4 files changed, 38 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 7b8d3cb4252..e82a597c61e 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -850,4 +850,8 @@ class Trashbin { //Listen to delete user signal \OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook"); } + + public static function preview_icon($path) { + return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 44, 'y' => 44, 'file' => $path)); + } } diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 92a38bd2635..d53e38549d1 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -27,7 +27,7 @@ style="background-image:url()" - style="background-image:url()" + style="background-image:url()" > diff --git a/core/routes.php b/core/routes.php index 4b3ad53da01..41e82f8a73d 100644 --- a/core/routes.php +++ b/core/routes.php @@ -44,6 +44,8 @@ $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); $this->create('core_ajax_preview', '/core/preview.png') ->action('OC\Preview', 'previewRouter'); +$this->create('core_ajax_trashbin_preview', '/core/trashbinpreview.png') + ->action('OC\Preview', 'trashbinPreviewRouter'); $this->create('core_ajax_public_preview', '/core/publicpreview.png') ->action('OC\Preview', 'publicPreviewRouter'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; diff --git a/lib/preview.php b/lib/preview.php index 87e2e78d1d8..f12107c9f57 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -519,10 +519,6 @@ class Preview { $file = ''; $maxX = 0; $maxY = 0; - /* - * use: ?scalingup=0 / ?scalingup = 1 - * do not use ?scalingup=false / ?scalingup = true as these will always be true - */ $scalingup = true; if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); @@ -610,6 +606,37 @@ class Preview { } } + public static function trashbinPreviewRouter() { + if(!\OC_App::isEnabled('files_trashbin')){ + exit; + } + \OC_Util::checkLoggedIn(); + + $file = ''; + $maxX = 0; + $maxY = 0; + $scalingup = true; + + if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); + if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; + if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; + if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; + + if($file !== '' && $maxX !== 0 && $maxY !== 0) { + try{ + $preview = new Preview(\OC_User::getUser(), 'files_trashbin/files', $file, $maxX, $maxY, $scalingup); + $preview->showPreview(); + }catch(\Exception $e) { + \OC_Response::setStatus(404); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + exit; + } + }else{ + \OC_Response::setStatus(404); + exit; + } + } + public static function post_write($args) { self::post_delete($args); } -- cgit v1.2.3 From cf449d42e87b21dff0de35c394031c5fa28b56aa Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 10 Jul 2013 11:25:28 +0200 Subject: properly encode path --- apps/files/js/files.js | 2 +- apps/files_trashbin/lib/trash.php | 2 +- lib/helper.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 224167b99c1..06d193bf8f3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -960,7 +960,7 @@ function getMimeIcon(mime, ready){ getMimeIcon.cache={}; function getPreviewIcon(path, ready){ - ready(OC.Router.generate('core_ajax_preview', {file:path, x:44, y:44})); + ready(OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:44, y:44})); } function getUniqueName(name){ diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index e82a597c61e..fb99fca5b3f 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -852,6 +852,6 @@ class Trashbin { } public static function preview_icon($path) { - return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 44, 'y' => 44, 'file' => $path)); + return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) )); } } diff --git a/lib/helper.php b/lib/helper.php index 0a8962a5312..326f2567f99 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -231,7 +231,7 @@ class OC_Helper { * Returns the path to the preview of the file. */ public static function previewIcon($path) { - return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => $path)); + return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) )); } /** -- cgit v1.2.3 From 45d16916718ea103b371da9c7bef0385717d8cef Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 10 Jul 2013 13:38:42 +0200 Subject: fix orientation before caching preview --- lib/preview.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index f12107c9f57..6173fc8aa6b 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -332,7 +332,7 @@ class Preview { $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); - if(!$preview) { + if(!($preview instanceof \OC_Image)) { continue; } @@ -346,6 +346,8 @@ class Preview { if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false) { $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); } + + $preview->fixOrientation(); $this->userview->file_put_contents($cachepath, $preview->data()); break; @@ -382,8 +384,6 @@ class Preview { * @return image */ public function resizeAndCrop() { - $this->preview->fixOrientation(); - $image = $this->preview; $x = $this->maxX; $y = $this->maxY; -- cgit v1.2.3 From 7091d7a6d2c495901383d89aaa0030366bf61d02 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 10 Jul 2013 17:57:04 +0200 Subject: clean up oc\preview --- lib/preview.php | 301 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 181 insertions(+), 120 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 6173fc8aa6b..8ecad159157 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -23,7 +23,7 @@ require_once('preview/unknown.php'); require_once('preview/office.php'); class Preview { - //the thumbnail folder + //the thumbnail folder const THUMBNAILS_FOLDER = 'thumbnails'; //config @@ -50,7 +50,7 @@ class Preview { /** * @brief check if thumbnail or bigger version of thumbnail of file is cached - * @param $user userid + * @param $user userid - if no user is given, OC_User::getUser will be used * @param $root path of root * @param $file The path to the file where you want a thumbnail from * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image @@ -59,73 +59,35 @@ class Preview { * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - public function __construct($user=null, $root='', $file='', $maxX=0, $maxY=0, $scalingup=true, $force=false) { + public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingup=true) { //set config $this->max_x = \OC_Config::getValue('preview_max_x', null); $this->max_y = \OC_Config::getValue('preview_max_y', null); $this->max_scale_factor = \OC_Config::getValue('preview_max_scale_factor', 10); //save parameters - $this->file = $file; - $this->maxX = $maxX; - $this->maxY = $maxY; - $this->scalingup = $scalingup; + $this->setFile($file); + $this->setMaxX($maxX); + $this->setMaxY($maxY); + $this->setScalingUp($scalingup); //init fileviews + if($user === ''){ + $user = OC_User::getUser(); + } $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); $this->userview = new \OC\Files\View('/' . $user); + + $this->preview = null; - if($force !== true) { - if(!is_null($this->max_x)) { - if($this->maxX > $this->max_x) { - \OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, \OC_Log::DEBUG); - $this->maxX = $this->max_x; - } - } - - if(!is_null($this->max_y)) { - if($this->maxY > $this->max_y) { - \OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, \OC_Log::DEBUG); - $this->maxY = $this->max_y; - } - } - - $fileinfo = $this->fileview->getFileInfo($this->file); - if(array_key_exists('size', $fileinfo)){ - if((int) $fileinfo['size'] === 0){ - \OC_Log::write('core', 'You can\'t generate a preview of a 0 byte file (' . $this->file . ')', \OC_Log::ERROR); - throw new \Exception('0 byte file given'); - } - } - - //init providers - if(empty(self::$providers)) { - self::initProviders(); - } - - //check if there are any providers at all - if(empty(self::$providers)) { - \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); - throw new \Exception('No providers'); - } - - //validate parameters - if($file === '') { - \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); - throw new \Exception('File not found'); - } - - //check if file exists - if(!$this->fileview->file_exists($file)) { - \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); - throw new \Exception('File not found'); - } + //check if there are preview backends + if(empty(self::$providers)) { + self::initProviders(); + } - //check if given size makes sense - if($maxX === 0 || $maxY === 0) { - \OC_Log::write('core', 'Can not create preview with 0px width or 0px height', \OC_Log::ERROR); - throw new \Exception('Height and/or width set to 0'); - } + if(empty(self::$providers)) { + \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); + throw new \Exception('No preview providers'); } } @@ -165,7 +127,7 @@ class Preview { * @brief returns the name of the thumbnailfolder * @return string */ - public function getThumbnailsfolder() { + public function getThumbnailsFolder() { return self::THUMBNAILS_FOLDER; } @@ -193,16 +155,97 @@ class Preview { return $this->max_y; } + /** + * @brief set the path of the file you want a thumbnail from + * @return $this + */ + public function setFile($file) { + $this->file = $file; + return $this; + } + + /** + * @brief set the the max width of the preview + * @return $this + */ + public function setMaxX($maxX=1) { + if($maxX === 0) { + throw new \Exception('Cannot set width of 0!'); + } + $configMaxX = $this->getConfigMaxX(); + if(!is_null($configMaxX)) { + if($maxX > $configMaxX) { + \OC_Log::write('core', 'maxX reduced from ' . $maxX . ' to ' . $configMaxX, \OC_Log::DEBUG); + $maxX = $configMaxX; + } + } + $this->maxX = $maxX; + return $this; + } + + /** + * @brief set the the max height of the preview + * @return $this + */ + public function setMaxY($maxY=1) { + if($maxY === 0) { + throw new \Exception('Cannot set height of 0!'); + } + $configMaxY = $this->getConfigMaxY(); + if(!is_null($configMaxY)) { + if($maxY > $configMaxY) { + \OC_Log::write('core', 'maxX reduced from ' . $maxY . ' to ' . $configMaxY, \OC_Log::DEBUG); + $maxY = $configMaxY; + } + } + $this->maxY = $maxY; + return $this; + } + + /** + * @brief set whether or not scalingup is enabled + * @return $this + */ + public function setScalingup($scalingup) { + if($this->getMaxScaleFactor() === 1) { + $scalingup = false; + } + $this->scalingup = $scalingup; + return $this; + } + + /** + * @brief check if all parameters are valid + * @return integer + */ + public function isFileValid() { + $file = $this->getFile(); + if($file === '') { + \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); + return false; + } + + if(!$this->fileview->file_exists($file)) { + \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); + return false; + } + + return true; + } + /** * @brief deletes previews of a file with specific x and y * @return bool */ public function deletePreview() { - $fileinfo = $this->fileview->getFileInfo($this->file); + $file = $this->getFile(); + + $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; - $this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png'); - return; + $previepath = $this->getThumbnailsFolder() . '/' . $fileid . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; + $this->userview->unlink($previepath); + return $this->userview->file_exists($previepath); } /** @@ -210,12 +253,15 @@ class Preview { * @return bool */ public function deleteAllPreviews() { - $fileinfo = $this->fileview->getFileInfo($this->file); - $fileid = $fileinfo['fileid']; + $file = $this->getFile(); - $this->userview->deleteAll(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); - $this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); - return; + $fileinfo = $this->fileview->getFileInfo($file); + $fileid = $fileinfo['fileid']; + + $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; + $this->userview->deleteAll($previewpath); + $this->userview->rmdir($previewpath); + return $this->userview->is_dir($previepath); } /** @@ -225,21 +271,23 @@ class Preview { * path to thumbnail if thumbnail exists */ private function isCached() { - $file = $this->file; - $maxX = $this->maxX; - $maxY = $this->maxY; - $scalingup = $this->scalingup; + $file = $this->getFile(); + $maxX = $this->getMaxX(); + $maxY = $this->getMaxY(); + $scalingup = $this->getScalingup(); + $maxscalefactor = $this->getMaxScaleFactor(); $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; - if(!$this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid)) { + $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; + if(!$this->userview->is_dir($previewpath)) { return false; } //does a preview with the wanted height and width already exist? - if($this->userview->file_exists(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png')) { - return self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; + if($this->userview->file_exists($previewpath . $maxX . '-' . $maxY . '.png')) { + return $previewpath . $maxX . '-' . $maxY . '.png'; } $wantedaspectratio = $maxX / $maxY; @@ -247,7 +295,7 @@ class Preview { //array for usable cached thumbnails $possiblethumbnails = array(); - $allthumbnails = $this->userview->getDirectoryContent(self::THUMBNAILS_FOLDER . '/' . $fileid); + $allthumbnails = $this->userview->getDirectoryContent($previewpath); foreach($allthumbnails as $thumbnail) { $size = explode('-', $thumbnail['name']); $x = $size[0]; @@ -261,7 +309,7 @@ class Preview { if($x < $maxX || $y < $maxY) { if($scalingup) { $scalefactor = $maxX / $x; - if($scalefactor > $this->max_scale_factor) { + if($scalefactor > $maxscalefactor) { continue; } }else{ @@ -307,22 +355,28 @@ class Preview { * @return image */ public function getPreview() { - $file = $this->file; - $maxX = $this->maxX; - $maxY = $this->maxY; - $scalingup = $this->scalingup; + if(!is_null($this->preview) && $this->preview->valid()){ + return $this->preview; + } + + $this->preview = null; + $file = $this->getFile(); + $maxX = $this->getMaxX(); + $maxY = $this->getMaxY(); + $scalingup = $this->getScalingup(); $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; - $cached = self::isCached(); + $cached = $this->isCached(); if($cached) { $image = new \OC_Image($this->userview->file_get_contents($cached, 'r')); - $this->preview = $image; - }else{ - $mimetype = $this->fileview->getMimeType($file); + $this->preview = $image->valid() ? $image : null; + } + if(is_null($this->preview)) { + $mimetype = $this->fileview->getMimeType($file); $preview = null; foreach(self::$providers as $supportedmimetype => $provider) { @@ -336,35 +390,35 @@ class Preview { continue; } - //are there any cached thumbnails yet - if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/') === false) { - $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/'); + $this->preview = $preview; + $this->resizeAndCrop(); + + $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; + $cachepath = $previewpath . $maxX . '-' . $maxY . '.png'; + + if($this->userview->is_dir($this->getThumbnailsFolder() . '/') === false) { + $this->userview->mkdir($this->getThumbnailsFolder() . '/'); } - //cache thumbnail - $cachepath = self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $maxX . '-' . $maxY . '.png'; - if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false) { - $this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/'); + if($this->userview->is_dir($previewpath) === false) { + $this->userview->mkdir($previewpath); } - $preview->fixOrientation(); $this->userview->file_put_contents($cachepath, $preview->data()); break; } + } - if(is_null($preview) || $preview === false) { - $preview = new \OC_Image(); - } - - $this->preview = $preview; + if(is_null($this->preview)) { + $this->preview = new \OC_Image(); } - $this->resizeAndCrop(); + return $this->preview; } /** - * @brief return a preview of a file + * @brief show preview * @param $file The path to the file where you want a thumbnail from * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image @@ -372,67 +426,74 @@ class Preview { * @return void */ public function showPreview() { - \OCP\Response::enableCaching(3600 * 24); // 24 hour - $preview = $this->getPreview(); - if($preview) { - $preview->show(); + \OCP\Response::enableCaching(3600 * 24); // 24 hours + if(is_null($this->preview)) { + $this->getPreview(); } + $this->preview->show(); } /** * @brief resize, crop and fix orientation * @return image */ - public function resizeAndCrop() { + private function resizeAndCrop() { $image = $this->preview; - $x = $this->maxX; - $y = $this->maxY; - $scalingup = $this->scalingup; + $x = $this->getMaxX(); + $y = $this->getMaxY(); + $scalingup = $this->getScalingup(); + $maxscalefactor = $this->getMaxScaleFactor(); if(!($image instanceof \OC_Image)) { - \OC_Log::write('core', 'Object passed to resizeAndCrop is not an instance of OC_Image', \OC_Log::DEBUG); + \OC_Log::write('core', '$this->preview is not an instance of OC_Image', \OC_Log::DEBUG); return; } + $image->fixOrientation(); + $realx = (int) $image->width(); $realy = (int) $image->height(); if($x === $realx && $y === $realy) { - return $image; + $this->preview = $image; + return true; } $factorX = $x / $realx; $factorY = $y / $realy; - + if($factorX >= $factorY) { $factor = $factorX; }else{ $factor = $factorY; } - - // only scale up if requested + if($scalingup === false) { - if($factor>1) $factor=1; + if($factor > 1) { + $factor = 1; + } } - if(!is_null($this->max_scale_factor)) { - if($factor > $this->max_scale_factor) { - \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $this->max_scale_factor, \OC_Log::DEBUG); - $factor = $this->max_scale_factor; + + if(!is_null($maxscalefactor)) { + if($factor > $maxscalefactor) { + \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $maxscalefactor, \OC_Log::DEBUG); + $factor = $maxscalefactor; } } - $newXsize = $realx * $factor; - $newYsize = $realy * $factor; - // resize + $newXsize = (int) ($realx * $factor); + $newYsize = (int) ($realy * $factor); + $image->preciseResize($newXsize, $newYsize); - if($newXsize === $x && $newYsize === $y) { + if($newXsize == $x && $newYsize === $y) { $this->preview = $image; return; } if($newXsize >= $x && $newYsize >= $y) { $cropX = floor(abs($x - $newXsize) * 0.5); + //don't crop previews on the Y axis, this sucks if it's a document. //$cropY = floor(abs($y - $newYsize) * 0.5); $cropY = 0; -- cgit v1.2.3 From f14b0fa6e0dfad28f2f6573ec517019ac12342cf Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 10 Jul 2013 18:01:04 +0200 Subject: update some comments in preview lib --- lib/preview.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 8ecad159157..0a8ab438367 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -348,10 +348,6 @@ class Preview { /** * @brief return a preview of a file - * @param $file The path to the file where you want a thumbnail from - * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image - * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image - * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return image */ public function getPreview() { @@ -419,10 +415,6 @@ class Preview { /** * @brief show preview - * @param $file The path to the file where you want a thumbnail from - * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image - * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image - * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly * @return void */ public function showPreview() { @@ -431,6 +423,7 @@ class Preview { $this->getPreview(); } $this->preview->show(); + return; } /** @@ -486,7 +479,7 @@ class Preview { $image->preciseResize($newXsize, $newYsize); - if($newXsize == $x && $newYsize === $y) { + if($newXsize === $x && $newYsize === $y) { $this->preview = $image; return; } -- cgit v1.2.3 From 5c31b843fc62b2be43d85ca680eeffa3e6f292dd Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 10 Jul 2013 18:04:13 +0200 Subject: fix typo --- lib/preview.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 0a8ab438367..f018fa38850 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -243,9 +243,9 @@ class Preview { $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; - $previepath = $this->getThumbnailsFolder() . '/' . $fileid . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; - $this->userview->unlink($previepath); - return $this->userview->file_exists($previepath); + $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; + $this->userview->unlink($previewpath); + return $this->userview->file_exists($previewpath); } /** @@ -261,7 +261,7 @@ class Preview { $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; $this->userview->deleteAll($previewpath); $this->userview->rmdir($previewpath); - return $this->userview->is_dir($previepath); + return $this->userview->is_dir($previewpath); } /** -- cgit v1.2.3 From 7f71ae60b0fefe697aa9da2cda40853736df0580 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 10:10:07 +0200 Subject: improve validation of oc\preview and implement preview of error icon if something went wrong --- lib/preview.php | 255 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 159 insertions(+), 96 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index f018fa38850..94e0cd96e7c 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -426,6 +426,14 @@ class Preview { return; } + /** + * @brief show preview + * @return void + */ + public function show() { + return $this->showPreview(); + } + /** * @brief resize, crop and fix orientation * @return image @@ -567,30 +575,40 @@ class Preview { * @brief method that handles preview requests from users that are logged in * @return void */ - public static function previewRouter($params) { + public static function previewRouter() { \OC_Util::checkLoggedIn(); - $file = ''; - $maxX = 0; - $maxY = 0; - $scalingup = true; - - if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); - if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; - if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; - if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - - if($file !== '' && $maxX !== 0 && $maxY !== 0) { - try{ - $preview = new Preview(\OC_User::getUser(), 'files', $file, $maxX, $maxY, $scalingup); - $preview->showPreview(); - }catch(\Exception $e) { - \OC_Response::setStatus(404); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - exit; - } - }else{ - \OC_Response::setStatus(404); + $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; + $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; + $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; + $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; + + if($file === '') { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + if($maxX === 0 || $maxY === 0) { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + try{ + $preview = new Preview(\OC_User::getUser(), 'files'); + $preview->setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingup); + + $preview->show(); + }catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + self::showErrorPreview(); exit; } } @@ -599,94 +617,132 @@ class Preview { * @brief method that handles preview requests from users that are not logged in / view shared folders that are public * @return void */ - public static function publicPreviewRouter($params) { - $file = ''; - $maxX = 0; - $maxY = 0; - $scalingup = true; - $token = ''; - - $user = null; - $path = null; - - if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); - if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; - if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; - if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - if(array_key_exists('t', $_GET)) $token = (string) $_GET['t']; - - $linkItem = \OCP\Share::getShareByToken($token); - - if (is_array($linkItem) && isset($linkItem['uid_owner']) && isset($linkItem['file_source'])) { - $userid = $linkItem['uid_owner']; - \OC_Util::setupFS($userid); - - $pathid = $linkItem['file_source']; - $path = \OC\Files\Filesystem::getPath($pathid); - $pathinfo = \OC\Files\Filesystem::getFileInfo($path); - - $sharedfile = null; - if($linkItem['item_type'] === 'folder') { - //clean up file parameter - $sharedfile = \OC\Files\Filesystem::normalizePath($file); - if(!\OC\Files\Filesystem::isValidPath($file)) { - \OC_Response::setStatus(403); - exit; - } - } else if($linkItem['item_type'] === 'file') { - $parent = $pathinfo['parent']; - $path = \OC\Files\Filesystem::getPath($parent); - $sharedfile = $pathinfo['name']; - } + public static function publicPreviewRouter() { + if(!\OC_App::isEnabled('files_sharing')){ + exit; + } - $path = \OC\Files\Filesystem::normalizePath($path, false); - if(substr($path, 0, 1) == '/') { - $path = substr($path, 1); - } + $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; + $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; + $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; + $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; + $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : ''; + + if($token === ''){ + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; } - if($userid !== null && $path !== null && $sharedfile !== null) { - try{ - $preview = new Preview($userid, 'files/' . $path, $sharedfile, $maxX, $maxY, $scalingup); - $preview->showPreview(); - }catch(\Exception $e) { - \OC_Response::setStatus(404); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + $linkedItem = \OCP\Share::getShareByToken($token); + if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) { + \OC_Response::setStatus(404); + \OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) { + \OC_Response::setStatus(500); + \OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")'); + self::showErrorPreview(); + exit; + } + + $userid = $linkedItem['uid_owner']; + \OC_Util::setupFS($userid); + + $pathid = $linkedItem['file_source']; + $path = \OC\Files\Filesystem::getPath($pathid); + $pathinfo = \OC\Files\Filesystem::getFileInfo($path); + $sharedfile = null; + + if($linkedItem['item_type'] === 'folder') { + $isvalid = \OC\File\Filesystem::isValidPath($file); + if(!$isvalid) { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN); + self::showErrorPreview(); exit; } - }else{ - \OC_Response::setStatus(404); + $sharedfile = \OC\Files\Filesystem::normalizePath($file); + } + + if($linkedItem['item_type'] === 'file') { + $parent = $pathinfo['parent']; + $path = \OC\Files\Filesystem::getPath($parent); + $sharedfile = $pathinfo['name']; + } + + $path = \OC\Files\Filesystem::normalizePath($path, false); + if(substr($path, 0, 1) == '/') { + $path = substr($path, 1); + } + + if($maxX === 0 || $maxY === 0) { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + $root = 'files/' . $path; + + try{ + $preview = new Preview($userid, $path); + $preview->setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingup); + + $preview->show(); + }catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + self::showErrorPreview(); exit; } } public static function trashbinPreviewRouter() { + \OC_Util::checkLoggedIn(); + if(!\OC_App::isEnabled('files_trashbin')){ exit; } - \OC_Util::checkLoggedIn(); - $file = ''; - $maxX = 0; - $maxY = 0; - $scalingup = true; - - if(array_key_exists('file', $_GET)) $file = (string) urldecode($_GET['file']); - if(array_key_exists('x', $_GET)) $maxX = (int) $_GET['x']; - if(array_key_exists('y', $_GET)) $maxY = (int) $_GET['y']; - if(array_key_exists('scalingup', $_GET)) $scalingup = (bool) $_GET['scalingup']; - - if($file !== '' && $maxX !== 0 && $maxY !== 0) { - try{ - $preview = new Preview(\OC_User::getUser(), 'files_trashbin/files', $file, $maxX, $maxY, $scalingup); - $preview->showPreview(); - }catch(\Exception $e) { - \OC_Response::setStatus(404); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - exit; - } - }else{ - \OC_Response::setStatus(404); + $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; + $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; + $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; + $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; + + if($file === '') { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + if($maxX === 0 || $maxY === 0) { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); + self::showErrorPreview(); + exit; + } + + try{ + $preview = new Preview(\OC_User::getUser(), 'files_trashbin/files'); + $preview->setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingup); + + $preview->showPreview(); + }catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + self::showErrorPreview(); exit; } } @@ -703,4 +759,11 @@ class Preview { $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); $preview->deleteAllPreviews(); } + + private static function showErrorPreview() { + $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; + $preview = new \OC_Image($path); + $preview->preciseResize(44, 44); + $preview->show(); + } } \ No newline at end of file -- cgit v1.2.3 From 4bbbba1dc8288462881d9bfdf979b3f207572d2e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 11:43:53 +0200 Subject: fix typo --- lib/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 94e0cd96e7c..5b2ee2cddd4 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -659,7 +659,7 @@ class Preview { $sharedfile = null; if($linkedItem['item_type'] === 'folder') { - $isvalid = \OC\File\Filesystem::isValidPath($file); + $isvalid = \OC\Files\Filesystem::isValidPath($file); if(!$isvalid) { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN); -- cgit v1.2.3 From 06eca985ce493bba65293003bd52aed10566c6d6 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 11:57:19 +0200 Subject: use $root instead of $path --- lib/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 5b2ee2cddd4..62bcf4873b5 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -690,7 +690,7 @@ class Preview { $root = 'files/' . $path; try{ - $preview = new Preview($userid, $path); + $preview = new Preview($userid, $root); $preview->setFile($file); $preview->setMaxX($maxX); $preview->setMaxY($maxY); -- cgit v1.2.3 From 53830f2f751151d2d326b253471e63d9b1cf8eb1 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 11:58:52 +0200 Subject: implement use of previews in sharing app --- apps/files/index.php | 1 + apps/files/templates/part.list.php | 9 ++++++++- apps/files_sharing/public.php | 3 +++ lib/helper.php | 4 ++++ lib/public/template.php | 10 ++++++++++ lib/template.php | 4 ++++ 6 files changed, 30 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/apps/files/index.php b/apps/files/index.php index 2338cf439e4..156febd87f4 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -95,6 +95,7 @@ $list->assign('files', $files); $list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir='); $list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/'))); $list->assign('disableSharing', false); +$list->assign('isPublic', false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir='); diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 38d1314392b..9e62c991975 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -30,7 +30,14 @@ $totalsize = 0; ?> style="background-image:url()" - style="background-image:url()" + + + style="background-image:url()" + + style="background-image:url()" + > diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 9462844a82b..0c4150f74d2 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -191,6 +191,9 @@ if (isset($path)) { $list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path='); $list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path='); + $list->assign('isPublic', true); + $list->assign('sharingtoken', $token); + $list->assign('sharingroot', ($path)); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path='); diff --git a/lib/helper.php b/lib/helper.php index 856dba625b3..6153f318723 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -234,6 +234,10 @@ class OC_Helper { return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) )); } + public static function publicPreview_icon( $path, $token ) { + return self::linkToRoute( 'core_ajax_public_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path), 't' => $token)); + } + /** * @brief Make a human file size * @param int $bytes file size in bytes diff --git a/lib/public/template.php b/lib/public/template.php index 5f9888f9f28..69997ad42b6 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -64,6 +64,16 @@ function preview_icon( $path ) { return(\preview_icon( $path )); } +/** + * @brief make publicpreview_icon available as a simple function + * Returns the path to the preview of the image. + * @param $path path of file + * @returns link to the preview + */ +function publicPreview_icon ( $path, $token ) { + return(\publicPreview_icon( $path, $token )); +} + /** * @brief make OC_Helper::humanFileSize available as a simple function * Makes 2048 to 2 kB. diff --git a/lib/template.php b/lib/template.php index 048d172f1c9..842c3325357 100644 --- a/lib/template.php +++ b/lib/template.php @@ -74,6 +74,10 @@ function preview_icon( $path ) { return OC_Helper::previewIcon( $path ); } +function publicPreview_icon ( $path, $token ) { + return OC_Helper::publicPreview_icon( $path, $token ); +} + /** * @brief make OC_Helper::mimetypeIcon available as a simple function * @param string $mimetype mimetype -- cgit v1.2.3 From ec75e1904d9d4c77d1a6c1c656e7deeae07a8804 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 12:28:41 +0200 Subject: make jenkins happy --- lib/preview/unknown.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index 4e1ca7de741..a31b365722e 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -22,7 +22,11 @@ class Unknown extends Provider { $iconsroot = \OC::$SERVERROOT . '/core/img/filetypes/'; - $icons = array($mimetype, $type, 'text'); + if(isset($type)){ + $icons = array($mimetype, $type, 'text'); + }else{ + $icons = array($mimetype, 'text'); + } foreach($icons as $icon) { $icon = str_replace('/', '-', $icon); -- cgit v1.2.3 From 7b2aa5d830efeea7e68a71ddc33bc6e9add1409d Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 19:03:21 +0200 Subject: OC\Preview - use camelCase --- lib/preview.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 62bcf4873b5..327a45d8d13 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -27,9 +27,9 @@ class Preview { const THUMBNAILS_FOLDER = 'thumbnails'; //config - private $max_scale_factor; - private $max_x; - private $max_y; + private $maxScaleFactor; + private $configMaxX; + private $configMaxY; //fileview object private $fileview = null; @@ -61,9 +61,9 @@ class Preview { */ public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingup=true) { //set config - $this->max_x = \OC_Config::getValue('preview_max_x', null); - $this->max_y = \OC_Config::getValue('preview_max_y', null); - $this->max_scale_factor = \OC_Config::getValue('preview_max_scale_factor', 10); + $this->configMaxX = \OC_Config::getValue('preview_max_x', null); + $this->configMaxY = \OC_Config::getValue('preview_max_y', null); + $this->maxScaleFactor = \OC_Config::getValue('preview_max_scale_factor', 10); //save parameters $this->setFile($file); @@ -136,7 +136,7 @@ class Preview { * @return integer */ public function getMaxScaleFactor() { - return $this->max_scale_factor; + return $this->maxScaleFactor; } /** @@ -144,7 +144,7 @@ class Preview { * @return integer */ public function getConfigMaxX() { - return $this->max_x; + return $this->configMaxX; } /** @@ -152,7 +152,7 @@ class Preview { * @return integer */ public function getConfigMaxY() { - return $this->max_y; + return $this->configMaxY; } /** -- cgit v1.2.3 From 1e8a646f51428d19f565fa702cbb935ca8267adb Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 19:21:37 +0200 Subject: OC\Preview - improve documentation --- lib/preview.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 327a45d8d13..fba1d893e08 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -50,11 +50,12 @@ class Preview { /** * @brief check if thumbnail or bigger version of thumbnail of file is cached - * @param $user userid - if no user is given, OC_User::getUser will be used - * @param $root path of root - * @param $file The path to the file where you want a thumbnail from - * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image - * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param string $user userid - if no user is given, OC_User::getUser will be used + * @param string $root path of root + * @param string $file The path to the file where you want a thumbnail from + * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image + * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image + * @param bool $scalingup Disable/Enable upscaling of previews * @return mixed (bool / string) * false if thumbnail does not exist * path to thumbnail if thumbnail exists @@ -157,6 +158,7 @@ class Preview { /** * @brief set the path of the file you want a thumbnail from + * @param string $file * @return $this */ public function setFile($file) { @@ -166,6 +168,7 @@ class Preview { /** * @brief set the the max width of the preview + * @param int $maxX * @return $this */ public function setMaxX($maxX=1) { @@ -185,6 +188,7 @@ class Preview { /** * @brief set the the max height of the preview + * @param int $maxY * @return $this */ public function setMaxY($maxY=1) { @@ -204,6 +208,7 @@ class Preview { /** * @brief set whether or not scalingup is enabled + * @param bool $scalingup * @return $this */ public function setScalingup($scalingup) { @@ -216,7 +221,7 @@ class Preview { /** * @brief check if all parameters are valid - * @return integer + * @return bool */ public function isFileValid() { $file = $this->getFile(); @@ -543,6 +548,7 @@ class Preview { /** * @brief register a new preview provider to be used * @param string $provider class name of a Preview_Provider + * @param array $options * @return void */ public static function registerProvider($class, $options=array()) { -- cgit v1.2.3 From c6849bed9da49b488497eb44c81059630bade2e0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 20:02:59 +0200 Subject: OC\Preview - remove unneeded comment --- lib/preview/provider.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib') diff --git a/lib/preview/provider.php b/lib/preview/provider.php index 44e1d11ba06..e4a730bafc8 100644 --- a/lib/preview/provider.php +++ b/lib/preview/provider.php @@ -1,7 +1,4 @@ Date: Thu, 11 Jul 2013 20:15:30 +0200 Subject: OC\Preview - fix logic of two return values --- lib/preview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index fba1d893e08..cc287595f40 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -250,7 +250,7 @@ class Preview { $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; $this->userview->unlink($previewpath); - return $this->userview->file_exists($previewpath); + return !$this->userview->file_exists($previewpath); } /** @@ -266,7 +266,7 @@ class Preview { $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; $this->userview->deleteAll($previewpath); $this->userview->rmdir($previewpath); - return $this->userview->is_dir($previewpath); + return !$this->userview->is_dir($previewpath); } /** -- cgit v1.2.3 From 14a35267c15115a1e7d2901ddd9b8c5c7e1b9a31 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 11 Jul 2013 20:35:55 +0200 Subject: OC\Preview - outsource static methods --- core/routes.php | 7 ++++--- lib/preview.php | 29 +++++++++++++++++++---------- lib/preview/images.php | 2 +- lib/preview/libreoffice-cl.php | 10 +++++----- lib/preview/movies.php | 2 +- lib/preview/mp3.php | 2 +- lib/preview/msoffice.php | 12 ++++++------ lib/preview/pdf.php | 2 +- lib/preview/svg.php | 2 +- lib/preview/txt.php | 6 +++--- lib/preview/unknown.php | 2 +- 11 files changed, 43 insertions(+), 33 deletions(-) (limited to 'lib') diff --git a/core/routes.php b/core/routes.php index 41e82f8a73d..c0e658b26dc 100644 --- a/core/routes.php +++ b/core/routes.php @@ -42,12 +42,13 @@ $this->create('js_config', '/core/js/config.js') // Routing $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); +OC::$CLASSPATH['OC\PreviewManager'] = 'lib/preview.php'; $this->create('core_ajax_preview', '/core/preview.png') - ->action('OC\Preview', 'previewRouter'); + ->action('OC\PreviewManager', 'previewRouter'); $this->create('core_ajax_trashbin_preview', '/core/trashbinpreview.png') - ->action('OC\Preview', 'trashbinPreviewRouter'); + ->action('OC\PreviewManager', 'trashbinPreviewRouter'); $this->create('core_ajax_public_preview', '/core/publicpreview.png') - ->action('OC\Preview', 'publicPreviewRouter'); + ->action('OC\PreviewManager', 'publicPreviewRouter'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; $this->create('core_lostpassword_index', '/lostpassword/') ->get() diff --git a/lib/preview.php b/lib/preview.php index cc287595f40..73e01a9e552 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -44,10 +44,6 @@ class Preview { //preview images object private $preview; - //preview providers - static private $providers = array(); - static private $registeredProviders = array(); - /** * @brief check if thumbnail or bigger version of thumbnail of file is cached * @param string $user userid - if no user is given, OC_User::getUser will be used @@ -82,11 +78,13 @@ class Preview { $this->preview = null; //check if there are preview backends - if(empty(self::$providers)) { - self::initProviders(); + $providers = PreviewManager::getProviders(); + if(empty($providers)) { + PreviewManager::initProviders(); } - if(empty(self::$providers)) { + $providers = PreviewManager::getProviders(); + if(empty($providers)) { \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); throw new \Exception('No preview providers'); } @@ -380,7 +378,8 @@ class Preview { $mimetype = $this->fileview->getMimeType($file); $preview = null; - foreach(self::$providers as $supportedmimetype => $provider) { + $providers = PreviewManager::getProviders(); + foreach($providers as $supportedmimetype => $provider) { if(!preg_match($supportedmimetype, $mimetype)) { continue; } @@ -544,6 +543,16 @@ class Preview { return; } } +} + +class PreviewManager { + //preview providers + static private $providers = array(); + static private $registeredProviders = array(); + + public static function getProviders() { + return self::$providers; + } /** * @brief register a new preview provider to be used @@ -559,7 +568,7 @@ class Preview { * @brief create instances of all the registered preview providers * @return void */ - private static function initProviders() { + public static function initProviders() { if(count(self::$providers)>0) { return; } @@ -766,7 +775,7 @@ class Preview { $preview->deleteAllPreviews(); } - private static function showErrorPreview() { + public static function showErrorPreview() { $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; $preview = new \OC_Image($path); $preview->preciseResize(44, 44); diff --git a/lib/preview/images.php b/lib/preview/images.php index 987aa9aef0a..84ab9f1ae43 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -30,4 +30,4 @@ class Image extends Provider { } } -\OC\Preview::registerProvider('OC\Preview\Image'); \ No newline at end of file +\OC\PreviewManager::registerProvider('OC\Preview\Image'); \ No newline at end of file diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 2749c4867e9..ffe8de505f7 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -80,7 +80,7 @@ class MSOfficeDoc extends Office { } -\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc'); +\OC\PreviewManager::registerProvider('OC\Preview\MSOfficeDoc'); //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) class MSOffice2003 extends Office { @@ -91,7 +91,7 @@ class MSOffice2003 extends Office { } -\OC\Preview::registerProvider('OC\Preview\MSOffice2003'); +\OC\PreviewManager::registerProvider('OC\Preview\MSOffice2003'); //.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx class MSOffice2007 extends Office { @@ -102,7 +102,7 @@ class MSOffice2007 extends Office { } -\OC\Preview::registerProvider('OC\Preview\MSOffice2007'); +\OC\PreviewManager::registerProvider('OC\Preview\MSOffice2007'); //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt class OpenDocument extends Office { @@ -113,7 +113,7 @@ class OpenDocument extends Office { } -\OC\Preview::registerProvider('OC\Preview\OpenDocument'); +\OC\PreviewManager::registerProvider('OC\Preview\OpenDocument'); //.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm class StarOffice extends Office { @@ -124,4 +124,4 @@ class StarOffice extends Office { } -\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file +\OC\PreviewManager::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 8531050d112..f4452e02fc2 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -39,5 +39,5 @@ if(!is_null(shell_exec('ffmpeg -version'))) { } } - \OC\Preview::registerProvider('OC\Preview\Movie'); + \OC\PreviewManager::registerProvider('OC\Preview\Movie'); } \ No newline at end of file diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 835ff529000..baa24ad129e 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -43,4 +43,4 @@ class MP3 extends Provider { } -\OC\Preview::registerProvider('OC\Preview\MP3'); \ No newline at end of file +\OC\PreviewManager::registerProvider('OC\Preview\MP3'); \ No newline at end of file diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index ccf1d674c7a..9f6ea7f74cf 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -20,7 +20,7 @@ class DOC extends Provider { } -\OC\Preview::registerProvider('OC\Preview\DOC'); +\OC\PreviewManager::registerProvider('OC\Preview\DOC'); */ class DOCX extends Provider { @@ -50,7 +50,7 @@ class DOCX extends Provider { } -\OC\Preview::registerProvider('OC\Preview\DOCX'); +\OC\PreviewManager::registerProvider('OC\Preview\DOCX'); class MSOfficeExcel extends Provider { @@ -95,7 +95,7 @@ class XLS extends MSOfficeExcel { } -\OC\Preview::registerProvider('OC\Preview\XLS'); +\OC\PreviewManager::registerProvider('OC\Preview\XLS'); class XLSX extends MSOfficeExcel { @@ -105,7 +105,7 @@ class XLSX extends MSOfficeExcel { } -\OC\Preview::registerProvider('OC\Preview\XLSX'); +\OC\PreviewManager::registerProvider('OC\Preview\XLSX'); /* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ... class MSOfficePowerPoint extends Provider { @@ -128,7 +128,7 @@ class PPT extends MSOfficePowerPoint { } -\OC\Preview::registerProvider('OC\Preview\PPT'); +\OC\PreviewManager::registerProvider('OC\Preview\PPT'); class PPTX extends MSOfficePowerPoint { @@ -138,5 +138,5 @@ class PPTX extends MSOfficePowerPoint { } -\OC\Preview::registerProvider('OC\Preview\PPTX'); +\OC\PreviewManager::registerProvider('OC\Preview\PPTX'); */ \ No newline at end of file diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 3eabd201156..0d289e9db94 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -36,5 +36,5 @@ if (extension_loaded('imagick')) { } } - \OC\Preview::registerProvider('OC\Preview\PDF'); + \OC\PreviewManager::registerProvider('OC\Preview\PDF'); } diff --git a/lib/preview/svg.php b/lib/preview/svg.php index bafaf71b15a..5507686af97 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -39,6 +39,6 @@ if (extension_loaded('imagick')) { } } - \OC\Preview::registerProvider('OC\Preview\SVG'); + \OC\PreviewManager::registerProvider('OC\Preview\SVG'); } \ No newline at end of file diff --git a/lib/preview/txt.php b/lib/preview/txt.php index c7b8fabc6b0..acbf34c5e42 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -46,7 +46,7 @@ class TXT extends Provider { } } -\OC\Preview::registerProvider('OC\Preview\TXT'); +\OC\PreviewManager::registerProvider('OC\Preview\TXT'); class PHP extends TXT { @@ -56,7 +56,7 @@ class PHP extends TXT { } -\OC\Preview::registerProvider('OC\Preview\PHP'); +\OC\PreviewManager::registerProvider('OC\Preview\PHP'); class JavaScript extends TXT { @@ -66,4 +66,4 @@ class JavaScript extends TXT { } -\OC\Preview::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file +\OC\PreviewManager::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index a31b365722e..f9f6fe957b2 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -40,4 +40,4 @@ class Unknown extends Provider { } } -\OC\Preview::registerProvider('OC\Preview\Unknown'); \ No newline at end of file +\OC\PreviewManager::registerProvider('OC\Preview\Unknown'); \ No newline at end of file -- cgit v1.2.3 From 33ac4d93d63b98761cf9c09467dcad7bc5d34bf0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 12 Jul 2013 10:03:25 +0200 Subject: OC\Preview - use !== and === instead of != and == --- lib/preview.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 73e01a9e552..5576981225b 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -305,7 +305,7 @@ class Preview { $y = $size[1]; $aspectratio = $x / $y; - if($aspectratio != $wantedaspectratio) { + if($aspectratio !== $wantedaspectratio) { continue; } @@ -691,7 +691,7 @@ class PreviewManager { } $path = \OC\Files\Filesystem::normalizePath($path, false); - if(substr($path, 0, 1) == '/') { + if(substr($path, 0, 1) === '/') { $path = substr($path, 1); } @@ -768,7 +768,7 @@ class PreviewManager { public static function post_delete($args) { $path = $args['path']; - if(substr($path, 0, 1) == '/') { + if(substr($path, 0, 1) === '/') { $path = substr($path, 1); } $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); -- cgit v1.2.3 From 21abebf96a45323b81ddf057d3851d25085b59ad Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 12 Jul 2013 11:50:24 +0200 Subject: OC\Preview - proper handling of a cached previews's filename --- lib/preview.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 5576981225b..08c0b7e20d0 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -283,6 +283,10 @@ class Preview { $fileinfo = $this->fileview->getFileInfo($file); $fileid = $fileinfo['fileid']; + if(is_null($fileid)) { + return false; + } + $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; if(!$this->userview->is_dir($previewpath)) { return false; @@ -293,18 +297,19 @@ class Preview { return $previewpath . $maxX . '-' . $maxY . '.png'; } - $wantedaspectratio = $maxX / $maxY; + $wantedaspectratio = (float) ($maxX / $maxY); //array for usable cached thumbnails $possiblethumbnails = array(); $allthumbnails = $this->userview->getDirectoryContent($previewpath); foreach($allthumbnails as $thumbnail) { - $size = explode('-', $thumbnail['name']); - $x = $size[0]; - $y = $size[1]; + $name = rtrim($thumbnail['name'], '.png'); + $size = explode('-', $name); + $x = (int) $size[0]; + $y = (int) $size[1]; - $aspectratio = $x / $y; + $aspectratio = (float) ($x / $y); if($aspectratio !== $wantedaspectratio) { continue; } -- cgit v1.2.3 From 1303fe0f9fe7c67764fb48cbb84fcb30e4a32b33 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sun, 14 Jul 2013 00:00:10 +0200 Subject: OC\Preview - set scale factor down to 2 and upscale cached preview - this got lost in a git stash ... --- lib/preview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 08c0b7e20d0..03aaaceb9ca 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -60,7 +60,7 @@ class Preview { //set config $this->configMaxX = \OC_Config::getValue('preview_max_x', null); $this->configMaxY = \OC_Config::getValue('preview_max_y', null); - $this->maxScaleFactor = \OC_Config::getValue('preview_max_scale_factor', 10); + $this->maxScaleFactor = \OC_Config::getValue('preview_max_scale_factor', 2); //save parameters $this->setFile($file); @@ -377,6 +377,7 @@ class Preview { if($cached) { $image = new \OC_Image($this->userview->file_get_contents($cached, 'r')); $this->preview = $image->valid() ? $image : null; + $this->resizeAndCrop(); } if(is_null($this->preview)) { -- cgit v1.2.3 From 65affdc9b32629ab4692f77ffd4dff77e026b1dc Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 29 Jul 2013 14:40:26 +0200 Subject: make previews in files app smaller --- lib/helper.php | 4 ++-- lib/preview.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index 6153f318723..0853c792750 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -231,11 +231,11 @@ class OC_Helper { * Returns the path to the preview of the file. */ public static function previewIcon($path) { - return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) )); + return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) )); } public static function publicPreview_icon( $path, $token ) { - return self::linkToRoute( 'core_ajax_public_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path), 't' => $token)); + return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path), 't' => $token)); } /** diff --git a/lib/preview.php b/lib/preview.php index 03aaaceb9ca..c570a17e4a7 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -784,7 +784,7 @@ class PreviewManager { public static function showErrorPreview() { $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; $preview = new \OC_Image($path); - $preview->preciseResize(44, 44); + $preview->preciseResize(36, 36); $preview->show(); } } \ No newline at end of file -- cgit v1.2.3 From e01bc7de987ddb7d33feb75ad598bdf97c348105 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 29 Jul 2013 14:46:20 +0200 Subject: Revert "OC\Preview - outsource static methods" This reverts commit 14a35267c15115a1e7d2901ddd9b8c5c7e1b9a31. --- core/routes.php | 7 +++---- lib/preview.php | 37 ++++++++++++++----------------------- lib/preview/images.php | 2 +- lib/preview/libreoffice-cl.php | 10 +++++----- lib/preview/movies.php | 2 +- lib/preview/mp3.php | 2 +- lib/preview/msoffice.php | 12 ++++++------ lib/preview/pdf.php | 2 +- lib/preview/svg.php | 2 +- lib/preview/txt.php | 6 +++--- lib/preview/unknown.php | 2 +- 11 files changed, 37 insertions(+), 47 deletions(-) (limited to 'lib') diff --git a/core/routes.php b/core/routes.php index c0e658b26dc..41e82f8a73d 100644 --- a/core/routes.php +++ b/core/routes.php @@ -42,13 +42,12 @@ $this->create('js_config', '/core/js/config.js') // Routing $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); -OC::$CLASSPATH['OC\PreviewManager'] = 'lib/preview.php'; $this->create('core_ajax_preview', '/core/preview.png') - ->action('OC\PreviewManager', 'previewRouter'); + ->action('OC\Preview', 'previewRouter'); $this->create('core_ajax_trashbin_preview', '/core/trashbinpreview.png') - ->action('OC\PreviewManager', 'trashbinPreviewRouter'); + ->action('OC\Preview', 'trashbinPreviewRouter'); $this->create('core_ajax_public_preview', '/core/publicpreview.png') - ->action('OC\PreviewManager', 'publicPreviewRouter'); + ->action('OC\Preview', 'publicPreviewRouter'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; $this->create('core_lostpassword_index', '/lostpassword/') ->get() diff --git a/lib/preview.php b/lib/preview.php index c570a17e4a7..113b200c29b 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -44,6 +44,10 @@ class Preview { //preview images object private $preview; + //preview providers + static private $providers = array(); + static private $registeredProviders = array(); + /** * @brief check if thumbnail or bigger version of thumbnail of file is cached * @param string $user userid - if no user is given, OC_User::getUser will be used @@ -78,13 +82,11 @@ class Preview { $this->preview = null; //check if there are preview backends - $providers = PreviewManager::getProviders(); - if(empty($providers)) { - PreviewManager::initProviders(); + if(empty(self::$providers)) { + self::initProviders(); } - $providers = PreviewManager::getProviders(); - if(empty($providers)) { + if(empty(self::$providers)) { \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR); throw new \Exception('No preview providers'); } @@ -384,8 +386,7 @@ class Preview { $mimetype = $this->fileview->getMimeType($file); $preview = null; - $providers = PreviewManager::getProviders(); - foreach($providers as $supportedmimetype => $provider) { + foreach(self::$providers as $supportedmimetype => $provider) { if(!preg_match($supportedmimetype, $mimetype)) { continue; } @@ -549,16 +550,6 @@ class Preview { return; } } -} - -class PreviewManager { - //preview providers - static private $providers = array(); - static private $registeredProviders = array(); - - public static function getProviders() { - return self::$providers; - } /** * @brief register a new preview provider to be used @@ -574,7 +565,7 @@ class PreviewManager { * @brief create instances of all the registered preview providers * @return void */ - public static function initProviders() { + private static function initProviders() { if(count(self::$providers)>0) { return; } @@ -600,8 +591,8 @@ class PreviewManager { \OC_Util::checkLoggedIn(); $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; - $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; - $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; + $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; + $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; if($file === '') { @@ -644,8 +635,8 @@ class PreviewManager { } $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; - $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; - $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; + $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; + $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : ''; @@ -781,7 +772,7 @@ class PreviewManager { $preview->deleteAllPreviews(); } - public static function showErrorPreview() { + private static function showErrorPreview() { $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; $preview = new \OC_Image($path); $preview->preciseResize(36, 36); diff --git a/lib/preview/images.php b/lib/preview/images.php index 84ab9f1ae43..987aa9aef0a 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -30,4 +30,4 @@ class Image extends Provider { } } -\OC\PreviewManager::registerProvider('OC\Preview\Image'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\Image'); \ No newline at end of file diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index ffe8de505f7..2749c4867e9 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -80,7 +80,7 @@ class MSOfficeDoc extends Office { } -\OC\PreviewManager::registerProvider('OC\Preview\MSOfficeDoc'); +\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc'); //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) class MSOffice2003 extends Office { @@ -91,7 +91,7 @@ class MSOffice2003 extends Office { } -\OC\PreviewManager::registerProvider('OC\Preview\MSOffice2003'); +\OC\Preview::registerProvider('OC\Preview\MSOffice2003'); //.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx class MSOffice2007 extends Office { @@ -102,7 +102,7 @@ class MSOffice2007 extends Office { } -\OC\PreviewManager::registerProvider('OC\Preview\MSOffice2007'); +\OC\Preview::registerProvider('OC\Preview\MSOffice2007'); //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt class OpenDocument extends Office { @@ -113,7 +113,7 @@ class OpenDocument extends Office { } -\OC\PreviewManager::registerProvider('OC\Preview\OpenDocument'); +\OC\Preview::registerProvider('OC\Preview\OpenDocument'); //.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm class StarOffice extends Office { @@ -124,4 +124,4 @@ class StarOffice extends Office { } -\OC\PreviewManager::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file diff --git a/lib/preview/movies.php b/lib/preview/movies.php index f4452e02fc2..8531050d112 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -39,5 +39,5 @@ if(!is_null(shell_exec('ffmpeg -version'))) { } } - \OC\PreviewManager::registerProvider('OC\Preview\Movie'); + \OC\Preview::registerProvider('OC\Preview\Movie'); } \ No newline at end of file diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index baa24ad129e..835ff529000 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -43,4 +43,4 @@ class MP3 extends Provider { } -\OC\PreviewManager::registerProvider('OC\Preview\MP3'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\MP3'); \ No newline at end of file diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index 9f6ea7f74cf..ccf1d674c7a 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -20,7 +20,7 @@ class DOC extends Provider { } -\OC\PreviewManager::registerProvider('OC\Preview\DOC'); +\OC\Preview::registerProvider('OC\Preview\DOC'); */ class DOCX extends Provider { @@ -50,7 +50,7 @@ class DOCX extends Provider { } -\OC\PreviewManager::registerProvider('OC\Preview\DOCX'); +\OC\Preview::registerProvider('OC\Preview\DOCX'); class MSOfficeExcel extends Provider { @@ -95,7 +95,7 @@ class XLS extends MSOfficeExcel { } -\OC\PreviewManager::registerProvider('OC\Preview\XLS'); +\OC\Preview::registerProvider('OC\Preview\XLS'); class XLSX extends MSOfficeExcel { @@ -105,7 +105,7 @@ class XLSX extends MSOfficeExcel { } -\OC\PreviewManager::registerProvider('OC\Preview\XLSX'); +\OC\Preview::registerProvider('OC\Preview\XLSX'); /* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ... class MSOfficePowerPoint extends Provider { @@ -128,7 +128,7 @@ class PPT extends MSOfficePowerPoint { } -\OC\PreviewManager::registerProvider('OC\Preview\PPT'); +\OC\Preview::registerProvider('OC\Preview\PPT'); class PPTX extends MSOfficePowerPoint { @@ -138,5 +138,5 @@ class PPTX extends MSOfficePowerPoint { } -\OC\PreviewManager::registerProvider('OC\Preview\PPTX'); +\OC\Preview::registerProvider('OC\Preview\PPTX'); */ \ No newline at end of file diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 0d289e9db94..3eabd201156 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -36,5 +36,5 @@ if (extension_loaded('imagick')) { } } - \OC\PreviewManager::registerProvider('OC\Preview\PDF'); + \OC\Preview::registerProvider('OC\Preview\PDF'); } diff --git a/lib/preview/svg.php b/lib/preview/svg.php index 5507686af97..bafaf71b15a 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -39,6 +39,6 @@ if (extension_loaded('imagick')) { } } - \OC\PreviewManager::registerProvider('OC\Preview\SVG'); + \OC\Preview::registerProvider('OC\Preview\SVG'); } \ No newline at end of file diff --git a/lib/preview/txt.php b/lib/preview/txt.php index acbf34c5e42..c7b8fabc6b0 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -46,7 +46,7 @@ class TXT extends Provider { } } -\OC\PreviewManager::registerProvider('OC\Preview\TXT'); +\OC\Preview::registerProvider('OC\Preview\TXT'); class PHP extends TXT { @@ -56,7 +56,7 @@ class PHP extends TXT { } -\OC\PreviewManager::registerProvider('OC\Preview\PHP'); +\OC\Preview::registerProvider('OC\Preview\PHP'); class JavaScript extends TXT { @@ -66,4 +66,4 @@ class JavaScript extends TXT { } -\OC\PreviewManager::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index f9f6fe957b2..a31b365722e 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -40,4 +40,4 @@ class Unknown extends Provider { } } -\OC\PreviewManager::registerProvider('OC\Preview\Unknown'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\Unknown'); \ No newline at end of file -- cgit v1.2.3 From 1e4ec2ac276b15232824da056b6253696d324d42 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 29 Jul 2013 15:47:17 +0200 Subject: add class='preview-icon' to rows in file app that make use of previews --- apps/files/templates/part.list.php | 12 ++++++++++-- lib/preview.php | 18 +++++++++++++++++- lib/public/preview.php | 38 +++++++++++--------------------------- 3 files changed, 38 insertions(+), 30 deletions(-) (limited to 'lib') diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 9e62c991975..b87000a8993 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -34,9 +34,17 @@ $totalsize = 0; ?> - style="background-image:url()" + + style="background-image:url()" class="preview-icon" + + style="background-image:url()" + - style="background-image:url()" + + style="background-image:url()" class="preview-icon" + + style="background-image:url()" + > diff --git a/lib/preview.php b/lib/preview.php index 113b200c29b..245ad64014e 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -771,7 +771,23 @@ class Preview { $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); $preview->deleteAllPreviews(); } - + + public static function isMimeSupported($mimetype) { + //check if there are preview backends + if(empty(self::$providers)) { + self::initProviders(); + } + + //remove last element because it has the mimetype * + $providers = array_slice(self::$providers, 0, -1); + foreach($providers as $supportedmimetype => $provider) { + if(preg_match($supportedmimetype, $mimetype)) { + return true; + } + } + return false; + } + private static function showErrorPreview() { $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; $preview = new \OC_Image($path); diff --git a/lib/public/preview.php b/lib/public/preview.php index a7487c485f1..e488eade4da 100644 --- a/lib/public/preview.php +++ b/lib/public/preview.php @@ -1,33 +1,11 @@ . -* -*/ - -/** - * Public interface of ownCloud for apps to use. - * Preview Class. - * + * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org + * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. */ - -// use OCP namespace for all classes that are considered public. -// This means that they should be used by apps instead of the internal ownCloud classes namespace OCP; /** @@ -47,4 +25,10 @@ class Preview { return(\OC_Preview::show($file,$maxX,$maxY,$scaleup)); } + + + public static function isMimeSupported($mimetype='*') { + return \OC\Preview::isMimeSupported($mimetype); + } + } -- cgit v1.2.3 From ac6a3133eca86b853da838ae310534b76e9fb662 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 30 Jul 2013 12:29:12 +0200 Subject: style fixes --- apps/files/js/files.js | 2 +- apps/files/templates/part.list.php | 2 +- apps/files_sharing/public.php | 2 +- core/ajax/preview.php | 42 +++++ core/ajax/publicpreview.php | 92 +++++++++++ core/ajax/trashbinpreview.php | 46 ++++++ core/routes.php | 6 +- lib/helper.php | 2 +- lib/preview.php | 308 ++++++++----------------------------- lib/preview/images.php | 7 +- lib/preview/libreoffice-cl.php | 24 +-- lib/preview/movies.php | 22 +-- lib/preview/mp3.php | 22 +-- lib/preview/msoffice.php | 24 +-- lib/preview/office.php | 7 +- lib/preview/pdf.php | 8 +- lib/preview/txt.php | 15 +- lib/preview/unknown.php | 8 +- lib/template.php | 3 + lib/template/functions.php | 16 ++ 20 files changed, 349 insertions(+), 309 deletions(-) create mode 100644 core/ajax/preview.php create mode 100644 core/ajax/publicpreview.php create mode 100644 core/ajax/trashbinpreview.php (limited to 'lib') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 53c6de09dd0..8b66ed6747b 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -825,7 +825,7 @@ function getMimeIcon(mime, ready){ getMimeIcon.cache={}; function getPreviewIcon(path, ready){ - ready(OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:44, y:44})); + ready(OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:36, y:36})); } function getUniqueName(name){ diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index a957a94f332..ab1b91167db 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -3,7 +3,7 @@ $totaldirs = 0; $totalsize = 0; ?> 6 $totalsize += $file['size']; if ($file['type'] === 'dir') { $totaldirs++; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 284b7a30208..650fa6a7c27 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -196,7 +196,7 @@ if (isset($path)) { OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path='); $list->assign('isPublic', true); $list->assign('sharingtoken', $token); - $list->assign('sharingroot', ($path)); + $list->assign('sharingroot', $basePath); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path='); diff --git a/core/ajax/preview.php b/core/ajax/preview.php new file mode 100644 index 00000000000..a9d127ffcc4 --- /dev/null +++ b/core/ajax/preview.php @@ -0,0 +1,42 @@ +setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); + + $preview->show(); +}catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + \OC\Preview::showErrorPreview(); + exit; +} \ No newline at end of file diff --git a/core/ajax/publicpreview.php b/core/ajax/publicpreview.php new file mode 100644 index 00000000000..aace24caa21 --- /dev/null +++ b/core/ajax/publicpreview.php @@ -0,0 +1,92 @@ +setFile($sharedFile); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); + + $preview->show(); +}catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + \OC\Preview::showErrorPreview(); + exit; +} \ No newline at end of file diff --git a/core/ajax/trashbinpreview.php b/core/ajax/trashbinpreview.php new file mode 100644 index 00000000000..d018a57d37b --- /dev/null +++ b/core/ajax/trashbinpreview.php @@ -0,0 +1,46 @@ +setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); + + $preview->showPreview(); +}catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + \OC\Preview::showErrorPreview(); + exit; +} \ No newline at end of file diff --git a/core/routes.php b/core/routes.php index 41e82f8a73d..75cc4d511c0 100644 --- a/core/routes.php +++ b/core/routes.php @@ -43,11 +43,11 @@ $this->create('js_config', '/core/js/config.js') $this->create('core_ajax_routes', '/core/routes.json') ->action('OC_Router', 'JSRoutes'); $this->create('core_ajax_preview', '/core/preview.png') - ->action('OC\Preview', 'previewRouter'); + ->actionInclude('core/ajax/preview.php'); $this->create('core_ajax_trashbin_preview', '/core/trashbinpreview.png') - ->action('OC\Preview', 'trashbinPreviewRouter'); + ->actionInclude('core/ajax/trashbinpreview.php'); $this->create('core_ajax_public_preview', '/core/publicpreview.png') - ->action('OC\Preview', 'publicPreviewRouter'); + ->actionInclude('core/ajax/publicpreview.php'); OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php'; $this->create('core_lostpassword_index', '/lostpassword/') ->get() diff --git a/lib/helper.php b/lib/helper.php index 460e5679b02..b74e4c4512e 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -233,7 +233,7 @@ class OC_Helper { return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) )); } - public static function publicPreview_icon( $path, $token ) { + public static function publicPreviewIcon( $path, $token ) { return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path), 't' => $token)); } diff --git a/lib/preview.php b/lib/preview.php index 245ad64014e..9f4d20b4650 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -55,12 +55,12 @@ class Preview { * @param string $file The path to the file where you want a thumbnail from * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image - * @param bool $scalingup Disable/Enable upscaling of previews + * @param bool $scalingUp Disable/Enable upscaling of previews * @return mixed (bool / string) * false if thumbnail does not exist * path to thumbnail if thumbnail exists */ - public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingup=true) { + public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingUp=true) { //set config $this->configMaxX = \OC_Config::getValue('preview_max_x', null); $this->configMaxY = \OC_Config::getValue('preview_max_y', null); @@ -70,11 +70,11 @@ class Preview { $this->setFile($file); $this->setMaxX($maxX); $this->setMaxY($maxY); - $this->setScalingUp($scalingup); + $this->setScalingUp($scalingUp); //init fileviews if($user === ''){ - $user = OC_User::getUser(); + $user = \OC_User::getUser(); } $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); $this->userview = new \OC\Files\View('/' . $user); @@ -120,7 +120,7 @@ class Preview { * @brief returns whether or not scalingup is enabled * @return bool */ - public function getScalingup() { + public function getScalingUp() { return $this->scalingup; } @@ -172,8 +172,8 @@ class Preview { * @return $this */ public function setMaxX($maxX=1) { - if($maxX === 0) { - throw new \Exception('Cannot set width of 0!'); + if($maxX <= 0) { + throw new \Exception('Cannot set width of 0 or smaller!'); } $configMaxX = $this->getConfigMaxX(); if(!is_null($configMaxX)) { @@ -192,8 +192,8 @@ class Preview { * @return $this */ public function setMaxY($maxY=1) { - if($maxY === 0) { - throw new \Exception('Cannot set height of 0!'); + if($maxY <= 0) { + throw new \Exception('Cannot set height of 0 or smaller!'); } $configMaxY = $this->getConfigMaxY(); if(!is_null($configMaxY)) { @@ -208,14 +208,14 @@ class Preview { /** * @brief set whether or not scalingup is enabled - * @param bool $scalingup + * @param bool $scalingUp * @return $this */ - public function setScalingup($scalingup) { + public function setScalingup($scalingUp) { if($this->getMaxScaleFactor() === 1) { - $scalingup = false; + $scalingUp = false; } - $this->scalingup = $scalingup; + $this->scalingup = $scalingUp; return $this; } @@ -245,12 +245,12 @@ class Preview { public function deletePreview() { $file = $this->getFile(); - $fileinfo = $this->fileview->getFileInfo($file); - $fileid = $fileinfo['fileid']; + $fileInfo = $this->fileview->getFileInfo($file); + $fileId = $fileInfo['fileid']; - $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; - $this->userview->unlink($previewpath); - return !$this->userview->file_exists($previewpath); + $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; + $this->userview->unlink($previewPath); + return !$this->userview->file_exists($previewPath); } /** @@ -260,13 +260,13 @@ class Preview { public function deleteAllPreviews() { $file = $this->getFile(); - $fileinfo = $this->fileview->getFileInfo($file); - $fileid = $fileinfo['fileid']; + $fileInfo = $this->fileview->getFileInfo($file); + $fileId = $fileInfo['fileid']; - $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; - $this->userview->deleteAll($previewpath); - $this->userview->rmdir($previewpath); - return !$this->userview->is_dir($previewpath); + $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; + $this->userview->deleteAll($previewPath); + $this->userview->rmdir($previewPath); + return !$this->userview->is_dir($previewPath); } /** @@ -279,45 +279,45 @@ class Preview { $file = $this->getFile(); $maxX = $this->getMaxX(); $maxY = $this->getMaxY(); - $scalingup = $this->getScalingup(); + $scalingUp = $this->getScalingUp(); $maxscalefactor = $this->getMaxScaleFactor(); - $fileinfo = $this->fileview->getFileInfo($file); - $fileid = $fileinfo['fileid']; + $fileInfo = $this->fileview->getFileInfo($file); + $fileId = $fileInfo['fileid']; - if(is_null($fileid)) { + if(is_null($fileId)) { return false; } - $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; - if(!$this->userview->is_dir($previewpath)) { + $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; + if(!$this->userview->is_dir($previewPath)) { return false; } //does a preview with the wanted height and width already exist? - if($this->userview->file_exists($previewpath . $maxX . '-' . $maxY . '.png')) { - return $previewpath . $maxX . '-' . $maxY . '.png'; + if($this->userview->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) { + return $previewPath . $maxX . '-' . $maxY . '.png'; } - $wantedaspectratio = (float) ($maxX / $maxY); + $wantedAspectRatio = (float) ($maxX / $maxY); //array for usable cached thumbnails - $possiblethumbnails = array(); + $possibleThumbnails = array(); - $allthumbnails = $this->userview->getDirectoryContent($previewpath); - foreach($allthumbnails as $thumbnail) { + $allThumbnails = $this->userview->getDirectoryContent($previewPath); + foreach($allThumbnails as $thumbnail) { $name = rtrim($thumbnail['name'], '.png'); $size = explode('-', $name); $x = (int) $size[0]; $y = (int) $size[1]; - $aspectratio = (float) ($x / $y); - if($aspectratio !== $wantedaspectratio) { + $aspectRatio = (float) ($x / $y); + if($aspectRatio !== $wantedAspectRatio) { continue; } if($x < $maxX || $y < $maxY) { - if($scalingup) { + if($scalingUp) { $scalefactor = $maxX / $x; if($scalefactor > $maxscalefactor) { continue; @@ -326,28 +326,28 @@ class Preview { continue; } } - $possiblethumbnails[$x] = $thumbnail['path']; + $possibleThumbnails[$x] = $thumbnail['path']; } - if(count($possiblethumbnails) === 0) { + if(count($possibleThumbnails) === 0) { return false; } - if(count($possiblethumbnails) === 1) { - return current($possiblethumbnails); + if(count($possibleThumbnails) === 1) { + return current($possibleThumbnails); } - ksort($possiblethumbnails); + ksort($possibleThumbnails); - if(key(reset($possiblethumbnails)) > $maxX) { - return current(reset($possiblethumbnails)); + if(key(reset($possibleThumbnails)) > $maxX) { + return current(reset($possibleThumbnails)); } - if(key(end($possiblethumbnails)) < $maxX) { - return current(end($possiblethumbnails)); + if(key(end($possibleThumbnails)) < $maxX) { + return current(end($possibleThumbnails)); } - foreach($possiblethumbnails as $width => $path) { + foreach($possibleThumbnails as $width => $path) { if($width < $maxX) { continue; }else{ @@ -358,7 +358,7 @@ class Preview { /** * @brief return a preview of a file - * @return image + * @return \OC_Image */ public function getPreview() { if(!is_null($this->preview) && $this->preview->valid()){ @@ -369,10 +369,10 @@ class Preview { $file = $this->getFile(); $maxX = $this->getMaxX(); $maxY = $this->getMaxY(); - $scalingup = $this->getScalingup(); + $scalingUp = $this->getScalingUp(); - $fileinfo = $this->fileview->getFileInfo($file); - $fileid = $fileinfo['fileid']; + $fileInfo = $this->fileview->getFileInfo($file); + $fileId = $fileInfo['fileid']; $cached = $this->isCached(); @@ -386,12 +386,12 @@ class Preview { $mimetype = $this->fileview->getMimeType($file); $preview = null; - foreach(self::$providers as $supportedmimetype => $provider) { - if(!preg_match($supportedmimetype, $mimetype)) { + foreach(self::$providers as $supportedMimetype => $provider) { + if(!preg_match($supportedMimetype, $mimetype)) { continue; } - $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview); + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileview); if(!($preview instanceof \OC_Image)) { continue; @@ -400,18 +400,18 @@ class Preview { $this->preview = $preview; $this->resizeAndCrop(); - $previewpath = $this->getThumbnailsFolder() . '/' . $fileid . '/'; - $cachepath = $previewpath . $maxX . '-' . $maxY . '.png'; + $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; + $cachePath = $previewPath . $maxX . '-' . $maxY . '.png'; if($this->userview->is_dir($this->getThumbnailsFolder() . '/') === false) { $this->userview->mkdir($this->getThumbnailsFolder() . '/'); } - if($this->userview->is_dir($previewpath) === false) { - $this->userview->mkdir($previewpath); + if($this->userview->is_dir($previewPath) === false) { + $this->userview->mkdir($previewPath); } - $this->userview->file_put_contents($cachepath, $preview->data()); + $this->userview->file_put_contents($cachePath, $preview->data()); break; } @@ -447,13 +447,13 @@ class Preview { /** * @brief resize, crop and fix orientation - * @return image + * @return void */ private function resizeAndCrop() { $image = $this->preview; $x = $this->getMaxX(); $y = $this->getMaxY(); - $scalingup = $this->getScalingup(); + $scalingUp = $this->getScalingUp(); $maxscalefactor = $this->getMaxScaleFactor(); if(!($image instanceof \OC_Image)) { @@ -480,7 +480,7 @@ class Preview { $factor = $factorY; } - if($scalingup === false) { + if($scalingUp === false) { if($factor > 1) { $factor = 1; } @@ -583,182 +583,6 @@ class Preview { array_multisort($keys, SORT_DESC, self::$providers); } - /** - * @brief method that handles preview requests from users that are logged in - * @return void - */ - public static function previewRouter() { - \OC_Util::checkLoggedIn(); - - $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; - $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; - $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; - $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; - - if($file === '') { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - if($maxX === 0 || $maxY === 0) { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - try{ - $preview = new Preview(\OC_User::getUser(), 'files'); - $preview->setFile($file); - $preview->setMaxX($maxX); - $preview->setMaxY($maxY); - $preview->setScalingUp($scalingup); - - $preview->show(); - }catch(\Exception $e) { - \OC_Response::setStatus(500); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - self::showErrorPreview(); - exit; - } - } - - /** - * @brief method that handles preview requests from users that are not logged in / view shared folders that are public - * @return void - */ - public static function publicPreviewRouter() { - if(!\OC_App::isEnabled('files_sharing')){ - exit; - } - - $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; - $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; - $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; - $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; - $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : ''; - - if($token === ''){ - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - $linkedItem = \OCP\Share::getShareByToken($token); - if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) { - \OC_Response::setStatus(404); - \OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) { - \OC_Response::setStatus(500); - \OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")'); - self::showErrorPreview(); - exit; - } - - $userid = $linkedItem['uid_owner']; - \OC_Util::setupFS($userid); - - $pathid = $linkedItem['file_source']; - $path = \OC\Files\Filesystem::getPath($pathid); - $pathinfo = \OC\Files\Filesystem::getFileInfo($path); - $sharedfile = null; - - if($linkedItem['item_type'] === 'folder') { - $isvalid = \OC\Files\Filesystem::isValidPath($file); - if(!$isvalid) { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN); - self::showErrorPreview(); - exit; - } - $sharedfile = \OC\Files\Filesystem::normalizePath($file); - } - - if($linkedItem['item_type'] === 'file') { - $parent = $pathinfo['parent']; - $path = \OC\Files\Filesystem::getPath($parent); - $sharedfile = $pathinfo['name']; - } - - $path = \OC\Files\Filesystem::normalizePath($path, false); - if(substr($path, 0, 1) === '/') { - $path = substr($path, 1); - } - - if($maxX === 0 || $maxY === 0) { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - $root = 'files/' . $path; - - try{ - $preview = new Preview($userid, $root); - $preview->setFile($file); - $preview->setMaxX($maxX); - $preview->setMaxY($maxY); - $preview->setScalingUp($scalingup); - - $preview->show(); - }catch(\Exception $e) { - \OC_Response::setStatus(500); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - self::showErrorPreview(); - exit; - } - } - - public static function trashbinPreviewRouter() { - \OC_Util::checkLoggedIn(); - - if(!\OC_App::isEnabled('files_trashbin')){ - exit; - } - - $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; - $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; - $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; - $scalingup = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; - - if($file === '') { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - if($maxX === 0 || $maxY === 0) { - \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - self::showErrorPreview(); - exit; - } - - try{ - $preview = new Preview(\OC_User::getUser(), 'files_trashbin/files'); - $preview->setFile($file); - $preview->setMaxX($maxX); - $preview->setMaxY($maxY); - $preview->setScalingUp($scalingup); - - $preview->showPreview(); - }catch(\Exception $e) { - \OC_Response::setStatus(500); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - self::showErrorPreview(); - exit; - } - } - public static function post_write($args) { self::post_delete($args); } @@ -780,8 +604,8 @@ class Preview { //remove last element because it has the mimetype * $providers = array_slice(self::$providers, 0, -1); - foreach($providers as $supportedmimetype => $provider) { - if(preg_match($supportedmimetype, $mimetype)) { + foreach($providers as $supportedMimetype => $provider) { + if(preg_match($supportedMimetype, $mimetype)) { return true; } } diff --git a/lib/preview/images.php b/lib/preview/images.php index 987aa9aef0a..9aec967282d 100644 --- a/lib/preview/images.php +++ b/lib/preview/images.php @@ -16,10 +16,13 @@ class Image extends Provider { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { //get fileinfo - $fileinfo = $fileview->getFileInfo($path); + $fileInfo = $fileview->getFileInfo($path); + if(!$fileInfo) { + return false; + } //check if file is encrypted - if($fileinfo['encrypted'] === true) { + if($fileInfo['encrypted'] === true) { $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r'))); }else{ $image = new \OC_Image(); diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 2749c4867e9..0f4ec3d0348 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -22,28 +22,30 @@ class Office extends Provider { return false; } - $abspath = $fileview->toTmpFile($path); + $absPath = $fileview->toTmpFile($path); - $tmpdir = get_temp_dir(); + $tmpDir = get_temp_dir(); - $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpdir) . ' ' . escapeshellarg($abspath); - $export = 'export HOME=/' . $tmpdir; + $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath); + $export = 'export HOME=/' . $tmpDir; shell_exec($export . "\n" . $exec); //create imagick object from pdf try{ - $pdf = new \imagick($abspath . '.pdf' . '[0]'); + $pdf = new \imagick($absPath . '.pdf' . '[0]'); $pdf->setImageFormat('jpg'); - }catch(\Exception $e){ + }catch (\Exception $e) { + unlink($absPath); + unlink($absPath . '.pdf'); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); return false; } $image = new \OC_Image($pdf); - unlink($abspath); - unlink($abspath . '.pdf'); + unlink($absPath); + unlink($absPath . '.pdf'); return $image->valid() ? $image : false; } @@ -55,11 +57,13 @@ class Office extends Provider { $cmd = \OC_Config::getValue('preview_libreoffice_path', null); } - if($cmd === '' && shell_exec('libreoffice --headless --version')) { + $whichLibreOffice = shell_exec('which libreoffice'); + if($cmd === '' && !empty($whichLibreOffice)) { $cmd = 'libreoffice'; } - if($cmd === '' && shell_exec('openoffice --headless --version')) { + $whichOpenOffice = shell_exec('which openoffice'); + if($cmd === '' && !empty($whichOpenOffice)) { $cmd = 'openoffice'; } diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 8531050d112..e2a1b8edddc 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -8,7 +8,11 @@ */ namespace OC\Preview; -if(!is_null(shell_exec('ffmpeg -version'))) { +$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); +$whichFFMPEG = shell_exec('which ffmpeg'); +$isFFMPEGAvailable = !empty($whichFFMPEG); + +if($isShellExecEnabled && $isFFMPEGAvailable) { class Movie extends Provider { @@ -17,23 +21,23 @@ if(!is_null(shell_exec('ffmpeg -version'))) { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $abspath = \OC_Helper::tmpFile(); - $tmppath = \OC_Helper::tmpFile(); + $absPath = \OC_Helper::tmpFile(); + $tmpPath = \OC_Helper::tmpFile(); $handle = $fileview->fopen($path, 'rb'); $firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576 - file_put_contents($abspath, $firstmb); + file_put_contents($absPath, $firstmb); - //$cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; - $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath); + //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath; + $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmpPath); shell_exec($cmd); - $image = new \OC_Image($tmppath); + $image = new \OC_Image($tmpPath); - unlink($abspath); - unlink($tmppath); + unlink($absPath); + unlink($tmpPath); return $image->valid() ? $image : false; } diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php index 835ff529000..1eed566315c 100644 --- a/lib/preview/mp3.php +++ b/lib/preview/mp3.php @@ -18,19 +18,21 @@ class MP3 extends Provider { $getID3 = new \getID3(); - $tmppath = $fileview->toTmpFile($path); - - $tags = $getID3->analyze($tmppath); - \getid3_lib::CopyTagsToComments($tags); - $picture = @$tags['id3v2']['APIC'][0]['data']; - - unlink($tmppath); + $tmpPath = $fileview->toTmpFile($path); + + $tags = $getID3->analyze($tmpPath); + \getid3_lib::CopyTagsToComments($tags); + if(isset($tags['id3v2']['APIC'][0]['data'])) { + $picture = @$tags['id3v2']['APIC'][0]['data']; + unlink($tmpPath); + $image = new \OC_Image($picture); + return $image->valid() ? $image : $this->getNoCoverThumbnail(); + } - $image = new \OC_Image($picture); - return $image->valid() ? $image : $this->getNoCoverThumbnail($maxX, $maxY); + return $this->getNoCoverThumbnail(); } - public function getNoCoverThumbnail($maxX, $maxY) { + private function getNoCoverThumbnail() { $icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png'; if(!file_exists($icon)) { diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php index ccf1d674c7a..e69ab0ab8cb 100644 --- a/lib/preview/msoffice.php +++ b/lib/preview/msoffice.php @@ -32,16 +32,16 @@ class DOCX extends Provider { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { require_once('phpdocx/classes/TransformDoc.inc'); - $tmpdoc = $fileview->toTmpFile($path); + $tmpDoc = $fileview->toTmpFile($path); $transformdoc = new \TransformDoc(); - $transformdoc->setStrFile($tmpdoc); - $transformdoc->generatePDF($tmpdoc); + $transformdoc->setStrFile($tmpDoc); + $transformdoc->generatePDF($tmpDoc); - $pdf = new \imagick($tmpdoc . '[0]'); + $pdf = new \imagick($tmpDoc . '[0]'); $pdf->setImageFormat('jpg'); - unlink($tmpdoc); + unlink($tmpDoc); $image = new \OC_Image($pdf); @@ -62,23 +62,23 @@ class MSOfficeExcel extends Provider { require_once('PHPExcel/Classes/PHPExcel.php'); require_once('PHPExcel/Classes/PHPExcel/IOFactory.php'); - $abspath = $fileview->toTmpFile($path); - $tmppath = \OC_Helper::tmpFile(); + $absPath = $fileview->toTmpFile($path); + $tmpPath = \OC_Helper::tmpFile(); $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF; $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf'; \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath); - $phpexcel = new \PHPExcel($abspath); + $phpexcel = new \PHPExcel($absPath); $excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF'); - $excel->save($tmppath); + $excel->save($tmpPath); - $pdf = new \imagick($tmppath . '[0]'); + $pdf = new \imagick($tmpPath . '[0]'); $pdf->setImageFormat('jpg'); - unlink($abspath); - unlink($tmppath); + unlink($absPath); + unlink($tmpPath); $image = new \OC_Image($pdf); diff --git a/lib/preview/office.php b/lib/preview/office.php index b6783bc5798..b93e1e57c8b 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -7,8 +7,13 @@ */ //both, libreoffice backend and php fallback, need imagick if (extension_loaded('imagick')) { + $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); + $whichLibreOffice = shell_exec('which libreoffice'); + $isLibreOfficeAvailable = !empty($whichLibreOffice); + $whichOpenOffice = shell_exec('which libreoffice'); + $isOpenOfficeAvailable = !empty($whichOpenOffice); //let's see if there is libreoffice or openoffice on this machine - if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { + if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) { require_once('libreoffice-cl.php'); }else{ //in case there isn't, use our fallback diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 3eabd201156..723dc1d80d2 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -16,18 +16,18 @@ if (extension_loaded('imagick')) { } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $tmppath = $fileview->toTmpFile($path); + $tmpPath = $fileview->toTmpFile($path); //create imagick object from pdf try{ - $pdf = new \imagick($tmppath . '[0]'); + $pdf = new \imagick($tmpPath . '[0]'); $pdf->setImageFormat('jpg'); - }catch(\Exception $e){ + }catch (\Exception $e) { \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); return false; } - unlink($tmppath); + unlink($tmpPath); //new image object $image = new \OC_Image($pdf); diff --git a/lib/preview/txt.php b/lib/preview/txt.php index c7b8fabc6b0..89927fd580a 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -18,24 +18,23 @@ class TXT extends Provider { $content = stream_get_contents($content); $lines = preg_split("/\r\n|\n|\r/", $content); - $numoflines = count($lines); - $fontsize = 5; //5px - $linesize = ceil($fontsize * 1.25); + $fontSize = 5; //5px + $lineSize = ceil($fontSize * 1.25); $image = imagecreate($maxX, $maxY); - $imagecolor = imagecolorallocate($image, 255, 255, 255); - $textcolor = imagecolorallocate($image, 0, 0, 0); + imagecolorallocate($image, 255, 255, 255); + $textColor = imagecolorallocate($image, 0, 0, 0); foreach($lines as $index => $line) { $index = $index + 1; $x = (int) 1; - $y = (int) ($index * $linesize) - $fontsize; + $y = (int) ($index * $lineSize) - $fontSize; - imagestring($image, 1, $x, $y, $line, $textcolor); + imagestring($image, 1, $x, $y, $line, $textColor); - if(($index * $linesize) >= $maxY) { + if(($index * $lineSize) >= $maxY) { break; } } diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index a31b365722e..ba13ca35d66 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -20,7 +20,7 @@ class Unknown extends Provider { list($type, $subtype) = explode('/', $mimetype); } - $iconsroot = \OC::$SERVERROOT . '/core/img/filetypes/'; + $iconsRoot = \OC::$SERVERROOT . '/core/img/filetypes/'; if(isset($type)){ $icons = array($mimetype, $type, 'text'); @@ -30,10 +30,10 @@ class Unknown extends Provider { foreach($icons as $icon) { $icon = str_replace('/', '-', $icon); - $iconpath = $iconsroot . $icon . '.png'; + $iconPath = $iconsRoot . $icon . '.png'; - if(file_exists($iconpath)) { - return new \OC_Image($iconpath); + if(file_exists($iconPath)) { + return new \OC_Image($iconPath); } } return false; diff --git a/lib/template.php b/lib/template.php index caa1e667c61..9b2c1211e61 100644 --- a/lib/template.php +++ b/lib/template.php @@ -23,6 +23,9 @@ require_once __DIR__.'/template/functions.php'; +/** + * This class provides the templates for ownCloud. + */ class OC_Template extends \OC\Template\Base { private $renderas; // Create a full page? private $path; // The path to the template diff --git a/lib/template/functions.php b/lib/template/functions.php index a864614c9a1..842f28c90e0 100644 --- a/lib/template/functions.php +++ b/lib/template/functions.php @@ -47,6 +47,22 @@ function image_path( $app, $image ) { return OC_Helper::imagePath( $app, $image ); } +/** + * @brief make preview_icon available as a simple function + * Returns the path to the preview of the image. + * @param $path path of file + * @returns link to the preview + * + * For further information have a look at OC_Helper::previewIcon + */ +function preview_icon( $path ) { + return OC_Helper::previewIcon( $path ); +} + +function publicPreview_icon ( $path, $token ) { + return OC_Helper::publicPreviewIcon( $path, $token ); +} + /** * @brief make OC_Helper::mimetypeIcon available as a simple function * @param string $mimetype mimetype -- cgit v1.2.3 From d84d8f71082ba17a9f37f86600a71d20e2481772 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 30 Jul 2013 12:35:39 +0200 Subject: fix merge conflicts --- lib/template/functions.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/template/functions.php b/lib/template/functions.php index 842f28c90e0..a892e310362 100644 --- a/lib/template/functions.php +++ b/lib/template/functions.php @@ -47,22 +47,6 @@ function image_path( $app, $image ) { return OC_Helper::imagePath( $app, $image ); } -/** - * @brief make preview_icon available as a simple function - * Returns the path to the preview of the image. - * @param $path path of file - * @returns link to the preview - * - * For further information have a look at OC_Helper::previewIcon - */ -function preview_icon( $path ) { - return OC_Helper::previewIcon( $path ); -} - -function publicPreview_icon ( $path, $token ) { - return OC_Helper::publicPreviewIcon( $path, $token ); -} - /** * @brief make OC_Helper::mimetypeIcon available as a simple function * @param string $mimetype mimetype @@ -87,7 +71,7 @@ function preview_icon( $path ) { } function publicPreview_icon ( $path, $token ) { - return OC_Helper::publicPreview_icon( $path, $token ); + return OC_Helper::publicPreviewIcon( $path, $token ); } /** -- cgit v1.2.3 From 640253fa31928ff52ba41e53cf50192c4b0002e9 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 30 Jul 2013 13:43:15 +0200 Subject: fix code style of try catch blocks --- core/ajax/publicpreview.php | 2 +- lib/preview/libreoffice-cl.php | 2 +- lib/preview/pdf.php | 2 +- lib/preview/svg.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/core/ajax/publicpreview.php b/core/ajax/publicpreview.php index aace24caa21..955fbc2626a 100644 --- a/core/ajax/publicpreview.php +++ b/core/ajax/publicpreview.php @@ -84,7 +84,7 @@ try{ $preview->setScalingUp($scalingUp); $preview->show(); -}catch(\Exception $e) { +} catch (\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); \OC\Preview::showErrorPreview(); diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php index 0f4ec3d0348..2f1d08499ef 100644 --- a/lib/preview/libreoffice-cl.php +++ b/lib/preview/libreoffice-cl.php @@ -35,7 +35,7 @@ class Office extends Provider { try{ $pdf = new \imagick($absPath . '.pdf' . '[0]'); $pdf->setImageFormat('jpg'); - }catch (\Exception $e) { + } catch (\Exception $e) { unlink($absPath); unlink($absPath . '.pdf'); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php index 723dc1d80d2..cc974b68818 100644 --- a/lib/preview/pdf.php +++ b/lib/preview/pdf.php @@ -22,7 +22,7 @@ if (extension_loaded('imagick')) { try{ $pdf = new \imagick($tmpPath . '[0]'); $pdf->setImageFormat('jpg'); - }catch (\Exception $e) { + } catch (\Exception $e) { \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); return false; } diff --git a/lib/preview/svg.php b/lib/preview/svg.php index bafaf71b15a..e939e526b1b 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -27,7 +27,7 @@ if (extension_loaded('imagick')) { $svg->readImageBlob($content); $svg->setImageFormat('jpg'); - }catch(\Exception $e){ + } catch (\Exception $e) { \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); return false; } -- cgit v1.2.3 From 554b1990e23c76aea182e9b8c2687f8f8b939fb9 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 5 Aug 2013 14:23:30 +0200 Subject: suppress is_file error msg --- lib/image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/image.php b/lib/image.php index c1b187608a6..4bc38e20e56 100644 --- a/lib/image.php +++ b/lib/image.php @@ -392,7 +392,7 @@ class OC_Image { */ public function loadFromFile($imagepath=false) { // exif_imagetype throws "read error!" if file is less than 12 byte - if(!is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) { + if(!@is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) { // Debug output disabled because this method is tried before loadFromBase64? OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG); return false; -- cgit v1.2.3 From 3e7a86c6ecd332c268e690399a015ab618e87754 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 6 Aug 2013 15:59:06 +0200 Subject: remove deleted files while scanning --- lib/files/cache/scanner.php | 2 ++ tests/lib/files/cache/scanner.php | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index adecc2bb901..3349245616d 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -112,6 +112,8 @@ class Scanner extends BasicEmitter { if (!empty($newData)) { $this->cache->put($file, $newData); } + } else { + $this->cache->remove($file); } return $data; } diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index 263ceadccc7..bb90adce5c1 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -166,6 +166,16 @@ class Scanner extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->cache->inCache('folder/bar.txt')); } + public function testScanRemovedFile(){ + $this->fillTestFolders(); + + $this->scanner->scan(''); + $this->assertTrue($this->cache->inCache('folder/bar.txt')); + $this->storage->unlink('folder/bar.txt'); + $this->scanner->scanFile('folder/bar.txt'); + $this->assertFalse($this->cache->inCache('folder/bar.txt')); + } + function setUp() { $this->storage = new \OC\Files\Storage\Temporary(array()); $this->scanner = new \OC\Files\Cache\Scanner($this->storage); -- cgit v1.2.3 From dcc92445a0bc3d9d47768ac0f640780f2b09a5fd Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 7 Aug 2013 11:51:08 +0200 Subject: allow permissions.user to be null as suggested by @butonic --- db_structure.xml | 2 +- lib/util.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/db_structure.xml b/db_structure.xml index ef5de653033..4c192ba028e 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -383,7 +383,7 @@ user text - true + false 64 diff --git a/lib/util.php b/lib/util.php index b7dc2207e6c..dc13d31fd2b 100755 --- a/lib/util.php +++ b/lib/util.php @@ -78,7 +78,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 80, 05); + return array(5, 80, 06); } /** -- cgit v1.2.3 From 1c9d52774e165da3d916399510727de6b7c487fa Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 9 Aug 2013 09:31:53 +0200 Subject: update indexes of oc_permissions --- db_structure.xml | 2 -- lib/util.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/db_structure.xml b/db_structure.xml index 4c192ba028e..1fcba9e2247 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -397,8 +397,6 @@ id_user_index - true - true fileid ascending diff --git a/lib/util.php b/lib/util.php index dc13d31fd2b..a7a83cf1a23 100755 --- a/lib/util.php +++ b/lib/util.php @@ -78,7 +78,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 80, 06); + return array(5, 80, 07); } /** -- cgit v1.2.3 From f9b281576726774c2109f8f909aceeb7320b4cae Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 14 Aug 2013 12:21:27 +0200 Subject: remove \OC\Preview::showErrorPreview --- core/ajax/preview.php | 3 --- core/ajax/publicpreview.php | 6 ------ core/ajax/trashbinpreview.php | 3 --- lib/preview.php | 7 ------- 4 files changed, 19 deletions(-) (limited to 'lib') diff --git a/core/ajax/preview.php b/core/ajax/preview.php index a9d127ffcc4..486155831d7 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -15,14 +15,12 @@ $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : if($file === '') { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } if($maxX === 0 || $maxY === 0) { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } @@ -37,6 +35,5 @@ try{ }catch(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - \OC\Preview::showErrorPreview(); exit; } \ No newline at end of file diff --git a/core/ajax/publicpreview.php b/core/ajax/publicpreview.php index 955fbc2626a..83194d5349c 100644 --- a/core/ajax/publicpreview.php +++ b/core/ajax/publicpreview.php @@ -18,7 +18,6 @@ $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : ''; if($token === ''){ \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } @@ -26,14 +25,12 @@ $linkedItem = \OCP\Share::getShareByToken($token); if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) { \OC_Response::setStatus(404); \OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) { \OC_Response::setStatus(500); \OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN); - \OC\Preview::showErrorPreview(); exit; } @@ -50,7 +47,6 @@ if($linkedItem['item_type'] === 'folder') { if(!$isvalid) { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN); - \OC\Preview::showErrorPreview(); exit; } $sharedFile = \OC\Files\Filesystem::normalizePath($file); @@ -70,7 +66,6 @@ if(substr($path, 0, 1) === '/') { if($maxX === 0 || $maxY === 0) { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } @@ -87,6 +82,5 @@ try{ } catch (\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - \OC\Preview::showErrorPreview(); exit; } \ No newline at end of file diff --git a/core/ajax/trashbinpreview.php b/core/ajax/trashbinpreview.php index d018a57d37b..a916dcf229f 100644 --- a/core/ajax/trashbinpreview.php +++ b/core/ajax/trashbinpreview.php @@ -19,14 +19,12 @@ $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : if($file === '') { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } if($maxX === 0 || $maxY === 0) { \OC_Response::setStatus(400); //400 Bad Request \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); - \OC\Preview::showErrorPreview(); exit; } @@ -41,6 +39,5 @@ try{ }catch(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - \OC\Preview::showErrorPreview(); exit; } \ No newline at end of file diff --git a/lib/preview.php b/lib/preview.php index 9f4d20b4650..92cc87c5897 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -611,11 +611,4 @@ class Preview { } return false; } - - private static function showErrorPreview() { - $path = \OC::$SERVERROOT . '/core/img/actions/delete.png'; - $preview = new \OC_Image($path); - $preview->preciseResize(36, 36); - $preview->show(); - } } \ No newline at end of file -- cgit v1.2.3 From e5761d90ef223a04205ad93eea7706439ef0b60e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 14 Aug 2013 20:49:47 +0200 Subject: fix deleting old previews after file changed --- lib/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 92cc87c5897..293accb188a 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -592,7 +592,7 @@ class Preview { if(substr($path, 0, 1) === '/') { $path = substr($path, 1); } - $preview = new Preview(\OC_User::getUser(), 'files/', $path, 0, 0, false, true); + $preview = new Preview(\OC_User::getUser(), 'files/', $path); $preview->deleteAllPreviews(); } -- cgit v1.2.3 From 623f9ec817490c93e8abf0825bab372acf08c29e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 14 Aug 2013 21:20:03 +0200 Subject: don't generate previews of empty txt files --- lib/preview/txt.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index 89927fd580a..c06f445e827 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -17,6 +17,10 @@ class TXT extends Provider { $content = $fileview->fopen($path, 'r'); $content = stream_get_contents($content); + if(trim($content) === '') { + return false; + } + $lines = preg_split("/\r\n|\n|\r/", $content); $fontSize = 5; //5px -- cgit v1.2.3 From ca495758bd8bcbea66f00296d36d87f66cd5f4a8 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 14 Aug 2013 23:06:43 +0200 Subject: Fix octemplate string escaping. --- core/js/octemplate.js | 8 ++++---- lib/base.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/core/js/octemplate.js b/core/js/octemplate.js index e69c6cc56e0..f7ee316f3b2 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -60,9 +60,9 @@ var self = this; if(typeof this.options.escapeFunction === 'function') { - for (var key = 0; key < this.vars.length; key++) { - if(typeof this.vars[key] === 'string') { - this.vars[key] = self.options.escapeFunction(this.vars[key]); + for (var key = 0; key < Object.keys(this.vars).length; key++) { + if(typeof this.vars[Object.keys(this.vars)[key]] === 'string') { + this.vars[Object.keys(this.vars)[key]] = self.options.escapeFunction(this.vars[Object.keys(this.vars)[key]]); } } } @@ -85,7 +85,7 @@ } }, options: { - escapeFunction: function(str) {return $('').text(str).html();} + escapeFunction: escapeHTML } }; diff --git a/lib/base.php b/lib/base.php index eaee8424651..18c172759b4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -257,8 +257,8 @@ class OC { OC_Util::addScript("compatibility"); OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); - OC_Util::addScript("octemplate"); OC_Util::addScript("js"); + OC_Util::addScript("octemplate"); OC_Util::addScript("eventsource"); OC_Util::addScript("config"); //OC_Util::addScript( "multiselect" ); -- cgit v1.2.3 From 7fe9320ffe60d9f8346f424a235bbc51c99f9484 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 15 Aug 2013 13:20:31 +0200 Subject: improve unknown backend --- lib/helper.php | 33 ++++++++++++++++++++++++++++++++- lib/preview/unknown.php | 22 +++------------------- 2 files changed, 35 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index b74e4c4512e..6552bcce703 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -188,7 +188,38 @@ class OC_Helper { * Returns the path to the image of this file type. */ public static function mimetypeIcon($mimetype) { - $alias = array('application/xml' => 'code/xml'); + $alias = array( + 'application/xml' => 'code/xml', + 'application/msword' => 'x-office/document', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document', + 'application/vnd.ms-word.document.macroEnabled.12' => 'x-office/document', + 'application/vnd.ms-word.template.macroEnabled.12' => 'x-office/document', + 'application/vnd.oasis.opendocument.text' => 'x-office/document', + 'application/vnd.oasis.opendocument.text-template' => 'x-office/document', + 'application/vnd.oasis.opendocument.text-web' => 'x-office/document', + 'application/vnd.oasis.opendocument.text-master' => 'x-office/document', + 'application/vnd.ms-powerpoint' => 'x-office/presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.template' => 'x-office/presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => 'x-office/presentation', + 'application/vnd.ms-powerpoint.addin.macroEnabled.12' => 'x-office/presentation', + 'application/vnd.ms-powerpoint.presentation.macroEnabled.12' => 'x-office/presentation', + 'application/vnd.ms-powerpoint.template.macroEnabled.12' => 'x-office/presentation', + 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation', + 'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation', + 'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation', + 'application/vnd.ms-excel' => 'x-office/spreadsheet', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.template' => 'x-office/spreadsheet', + 'application/vnd.ms-excel.sheet.macroEnabled.12' => 'x-office/spreadsheet', + 'application/vnd.ms-excel.template.macroEnabled.12' => 'x-office/spreadsheet', + 'application/vnd.ms-excel.addin.macroEnabled.12' => 'x-office/spreadsheet', + 'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet', + 'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet', + 'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet', + ); + if (isset($alias[$mimetype])) { $mimetype = $alias[$mimetype]; } diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php index ba13ca35d66..9e6cd68d401 100644 --- a/lib/preview/unknown.php +++ b/lib/preview/unknown.php @@ -16,27 +16,11 @@ class Unknown extends Provider { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { $mimetype = $fileview->getMimeType($path); - if(substr_count($mimetype, '/')) { - list($type, $subtype) = explode('/', $mimetype); - } - $iconsRoot = \OC::$SERVERROOT . '/core/img/filetypes/'; + $path = \OC_Helper::mimetypeIcon($mimetype); + $path = \OC::$SERVERROOT . substr($path, strlen(\OC::$WEBROOT)); - if(isset($type)){ - $icons = array($mimetype, $type, 'text'); - }else{ - $icons = array($mimetype, 'text'); - } - foreach($icons as $icon) { - $icon = str_replace('/', '-', $icon); - - $iconPath = $iconsRoot . $icon . '.png'; - - if(file_exists($iconPath)) { - return new \OC_Image($iconPath); - } - } - return false; + return new \OC_Image($path); } } -- cgit v1.2.3 From 825d8610d0abbf1063df3019533253908142ae43 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 15 Aug 2013 13:21:35 +0200 Subject: fix svg and cache transparency issue --- lib/image.php | 3 +++ lib/preview.php | 2 ++ lib/preview/svg.php | 8 +++++--- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/image.php b/lib/image.php index 4bc38e20e56..53ffb24d18c 100644 --- a/lib/image.php +++ b/lib/image.php @@ -496,6 +496,9 @@ class OC_Image { return false; } $this->resource = @imagecreatefromstring($str); + imagealphablending($this->resource, false); + imagesavealpha($this->resource, true); + if(!$this->resource) { OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG); return false; diff --git a/lib/preview.php b/lib/preview.php index 293accb188a..e7dd327d021 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -391,6 +391,8 @@ class Preview { continue; } + \OC_Log::write('core', 'Generating preview for "' . $file . '" with "' . get_class($provider) . '"', \OC_Log::DEBUG); + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileview); if(!($preview instanceof \OC_Image)) { diff --git a/lib/preview/svg.php b/lib/preview/svg.php index e939e526b1b..b49e51720fa 100644 --- a/lib/preview/svg.php +++ b/lib/preview/svg.php @@ -18,7 +18,7 @@ if (extension_loaded('imagick')) { public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { try{ $svg = new \Imagick(); - $svg->setResolution($maxX, $maxY); + $svg->setBackgroundColor(new \ImagickPixel('transparent')); $content = stream_get_contents($fileview->fopen($path, 'r')); if(substr($content, 0, 5) !== 'readImageBlob($content); - $svg->setImageFormat('jpg'); + $svg->setImageFormat('png32'); } catch (\Exception $e) { \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); return false; } + //new image object - $image = new \OC_Image($svg); + $image = new \OC_Image(); + $image->loadFromData($svg); //check if image object is valid return $image->valid() ? $image : false; } -- cgit v1.2.3 From 7a11911aead74e07ba2917be27e343ff93ca931f Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 15 Aug 2013 13:25:45 +0200 Subject: add comment to make @jancborchardt happy --- lib/preview/txt.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index c06f445e827..a487330691e 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -17,6 +17,7 @@ class TXT extends Provider { $content = $fileview->fopen($path, 'r'); $content = stream_get_contents($content); + //don't create previews of empty text files if(trim($content) === '') { return false; } -- cgit v1.2.3 From 9c5416fe4a12acf5631b8822feb942143bf2408f Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 15 Aug 2013 08:49:19 +0200 Subject: Clean up \OC\Util - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing --- core/lostpassword/controller.php | 2 +- core/minimizer.php | 4 +- core/setup.php | 4 +- lib/app.php | 8 +- lib/base.php | 8 +- lib/public/share.php | 2 +- lib/setup.php | 2 +- lib/setup/mysql.php | 2 +- lib/setup/oci.php | 2 +- lib/setup/postgresql.php | 2 +- lib/templatelayout.php | 4 +- lib/user.php | 2 +- lib/util.php | 458 ++++++++++++++++++++++----------------- settings/admin.php | 4 +- tests/lib/db.php | 2 +- tests/lib/dbschema.php | 2 +- tests/lib/util.php | 4 +- 17 files changed, 290 insertions(+), 222 deletions(-) (limited to 'lib') diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 74a5be2b96f..f761e45d25f 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -42,7 +42,7 @@ class OC_Core_LostPassword_Controller { } if (OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', '')); + $token = hash('sha256', OC_Util::generateRandomBytes(30).OC_Config::getValue('passwordsalt', '')); OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); diff --git a/core/minimizer.php b/core/minimizer.php index 4da9037c413..eeeddf86a81 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -5,11 +5,11 @@ OC_App::loadApps(); if ($service == 'core.css') { $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles); + $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); $minimizer->output($files, $service); } else if ($service == 'core.js') { $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts); + $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); $minimizer->output($files, $service); } diff --git a/core/setup.php b/core/setup.php index 40e30db533a..1a2eac16030 100644 --- a/core/setup.php +++ b/core/setup.php @@ -33,8 +33,8 @@ $opts = array( 'hasOracle' => $hasOracle, 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, - 'secureRNG' => OC_Util::secureRNG_available(), - 'htaccessWorking' => OC_Util::ishtaccessworking(), + 'secureRNG' => OC_Util::secureRNGAvailable(), + 'htaccessWorking' => OC_Util::isHtaccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), ); diff --git a/lib/app.php b/lib/app.php index 5fa650044f3..2f5a952d9f8 100644 --- a/lib/app.php +++ b/lib/app.php @@ -73,11 +73,11 @@ class OC_App{ if (!defined('DEBUG') || !DEBUG) { if (is_null($types) - && empty(OC_Util::$core_scripts) - && empty(OC_Util::$core_styles)) { - OC_Util::$core_scripts = OC_Util::$scripts; + && empty(OC_Util::$coreScripts) + && empty(OC_Util::$coreStyles)) { + OC_Util::$coreScripts = OC_Util::$scripts; OC_Util::$scripts = array(); - OC_Util::$core_styles = OC_Util::$styles; + OC_Util::$coreStyles = OC_Util::$styles; OC_Util::$styles = array(); } } diff --git a/lib/base.php b/lib/base.php index eaee8424651..7a4f5fc7ce4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -413,7 +413,7 @@ class OC { } self::initPaths(); - OC_Util::issetlocaleworking(); + OC_Util::isSetlocaleWorking(); // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { @@ -522,7 +522,7 @@ class OC { } // write error into log if locale can't be set - if (OC_Util::issetlocaleworking() == false) { + if (OC_Util::isSetlocaleWorking() == false) { OC_Log::write('core', 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', OC_Log::ERROR); @@ -735,7 +735,7 @@ class OC { if (in_array($_COOKIE['oc_token'], $tokens, true)) { // replace successfully used token with a new one OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']); - $token = OC_Util::generate_random_bytes(32); + $token = OC_Util::generateRandomBytes(32); OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time()); OC_User::setMagicInCookie($_COOKIE['oc_username'], $token); // login @@ -774,7 +774,7 @@ class OC { if (defined("DEBUG") && DEBUG) { OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); } - $token = OC_Util::generate_random_bytes(32); + $token = OC_Util::generateRandomBytes(32); OC_Preferences::setValue($_POST['user'], 'login_token', $token, time()); OC_User::setMagicInCookie($_POST["user"], $token); } else { diff --git a/lib/public/share.php b/lib/public/share.php index 63645e6fa34..7714837769d 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -463,7 +463,7 @@ class Share { if (isset($oldToken)) { $token = $oldToken; } else { - $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH); + $token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH); } $result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token); diff --git a/lib/setup.php b/lib/setup.php index 05a49890976..6bf3c88370f 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -61,7 +61,7 @@ class OC_Setup { } //generate a random salt that is used to salt the local user passwords - $salt = OC_Util::generate_random_bytes(30); + $salt = OC_Util::generateRandomBytes(30); OC_Config::setValue('passwordsalt', $salt); //write the config file diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php index 0cf04fde5a1..d97b6d2602f 100644 --- a/lib/setup/mysql.php +++ b/lib/setup/mysql.php @@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase { $this->dbuser=substr('oc_'.$username, 0, 16); if($this->dbuser!=$oldUser) { //hash the password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); diff --git a/lib/setup/oci.php b/lib/setup/oci.php index 86b53de45a4..326d7a00531 100644 --- a/lib/setup/oci.php +++ b/lib/setup/oci.php @@ -65,7 +65,7 @@ class OCI extends AbstractDatabase { //add prefix to the oracle user name to prevent collisions $this->dbuser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); //oracle passwords are treated as identifiers: // must start with aphanumeric char diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php index 49fcbf0326e..89d328ada19 100644 --- a/lib/setup/postgresql.php +++ b/lib/setup/postgresql.php @@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase { //add prefix to the postgresql user name to prevent collisions $this->dbuser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0024c9d4960..0b868a39e49 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -58,7 +58,7 @@ class OC_TemplateLayout extends OC_Template { if (OC_Config::getValue('installed', false) && $renderas!='error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); } - if (!empty(OC_Util::$core_scripts)) { + if (!empty(OC_Util::$coreScripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter); } foreach($jsfiles as $info) { @@ -71,7 +71,7 @@ class OC_TemplateLayout extends OC_Template { // Add the css files $cssfiles = self::findStylesheetFiles(OC_Util::$styles); $this->assign('cssfiles', array()); - if (!empty(OC_Util::$core_styles)) { + if (!empty(OC_Util::$coreStyles)) { $this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter); } foreach($cssfiles as $info) { diff --git a/lib/user.php b/lib/user.php index 93c7c9d4cd5..0f6f40aec9a 100644 --- a/lib/user.php +++ b/lib/user.php @@ -353,7 +353,7 @@ class OC_User { * generates a password */ public static function generatePassword() { - return OC_Util::generate_random_bytes(30); + return OC_Util::generateRandomBytes(30); } /** diff --git a/lib/util.php b/lib/util.php index 25632ac1ea2..24ae7d3d1c4 100755 --- a/lib/util.php +++ b/lib/util.php @@ -11,12 +11,16 @@ class OC_Util { public static $headers=array(); private static $rootMounted=false; private static $fsSetup=false; - public static $core_styles=array(); - public static $core_scripts=array(); + public static $coreStyles=array(); + public static $coreScripts=array(); - // Can be set up - public static function setupFS( $user = '' ) {// configure the initial filesystem based on the configuration - if(self::$fsSetup) {//setting up the filesystem twice can only lead to trouble + /** + * @brief Can be set up + * @param user string + * @return boolean + */ + public static function setupFS( $user = '' ) { // configure the initial filesystem based on the configuration + if(self::$fsSetup) { //setting up the filesystem twice can only lead to trouble return false; } @@ -37,42 +41,45 @@ class OC_Util { self::$fsSetup=true; } - $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); + $configDataDirectory = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); //first set up the local "root" storage \OC\Files\Filesystem::initMounts(); if(!self::$rootMounted) { - \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/'); - self::$rootMounted=true; + \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$configDataDirectory), '/'); + self::$rootMounted = true; } if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem - $user_dir = '/'.$user.'/files'; - $user_root = OC_User::getHome($user); - $userdirectory = $user_root . '/files'; - if( !is_dir( $userdirectory )) { - mkdir( $userdirectory, 0755, true ); + $userDir = '/'.$user.'/files'; + $userRoot = OC_User::getHome($user); + $userDirectory = $userRoot . '/files'; + if( !is_dir( $userDirectory )) { + mkdir( $userDirectory, 0755, true ); } //jail the user into his "home" directory - \OC\Files\Filesystem::init($user, $user_dir); + \OC\Files\Filesystem::init($user, $userDir); - $quotaProxy=new OC_FileProxy_Quota(); + $quotaProxy = new OC_FileProxy_Quota(); $fileOperationProxy = new OC_FileProxy_FileOperations(); OC_FileProxy::register($quotaProxy); OC_FileProxy::register($fileOperationProxy); - OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir)); + OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); } return true; } + /** + * @return void + */ public static function tearDownFS() { \OC\Files\Filesystem::tearDown(); self::$fsSetup=false; - self::$rootMounted=false; + self::$rootMounted=false; } /** - * get the current installed version of ownCloud + * @brief get the current installed version of ownCloud * @return array */ public static function getVersion() { @@ -82,7 +89,7 @@ class OC_Util { } /** - * get the current installed version string of ownCloud + * @brief get the current installed version string of ownCloud * @return string */ public static function getVersionString() { @@ -90,7 +97,7 @@ class OC_Util { } /** - * get the current installed edition of ownCloud. There is the community + * @description get the current installed edition of ownCloud. There is the community * edition that just returns an empty string and the enterprise edition * that returns "Enterprise". * @return string @@ -100,37 +107,39 @@ class OC_Util { } /** - * add a javascript file + * @brief add a javascript file * - * @param appid $application - * @param filename $file + * @param appid $application + * @param filename $file + * @return void */ public static function addScript( $application, $file = null ) { - if( is_null( $file )) { + if ( is_null( $file )) { $file = $application; $application = ""; } - if( !empty( $application )) { + if ( !empty( $application )) { self::$scripts[] = "$application/js/$file"; - }else{ + } else { self::$scripts[] = "js/$file"; } } /** - * add a css file + * @brief add a css file * - * @param appid $application - * @param filename $file + * @param appid $application + * @param filename $file + * @return void */ public static function addStyle( $application, $file = null ) { - if( is_null( $file )) { + if ( is_null( $file )) { $file = $application; $application = ""; } - if( !empty( $application )) { + if ( !empty( $application )) { self::$styles[] = "$application/css/$file"; - }else{ + } else { self::$styles[] = "css/$file"; } } @@ -140,63 +149,74 @@ class OC_Util { * @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 + * @return void */ public static function addHeader( $tag, $attributes, $text='') { - self::$headers[] = array('tag'=>$tag, 'attributes'=>$attributes, 'text'=>$text); + self::$headers[] = array( + 'tag'=>$tag, + 'attributes'=>$attributes, + 'text'=>$text + ); } /** - * formats a timestamp in the "right" way + * @brief formats a timestamp in the "right" way * * @param int timestamp $timestamp * @param bool dateOnly option to omit time from the result + * @return string timestamp */ public static function formatDate( $timestamp, $dateOnly=false) { - if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it + if(\OC::$session->exists('timezone')) { //adjust to clients timezone if we know it $systemTimeZone = intval(date('O')); - $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100); - $clientTimeZone=\OC::$session->get('timezone')*60; - $offset=$clientTimeZone-$systemTimeZone; - $timestamp=$timestamp+$offset*60; + $systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100); + $clientTimeZone = \OC::$session->get('timezone')*60; + $offset = $clientTimeZone - $systemTimeZone; + $timestamp = $timestamp + $offset*60; } - $l=OC_L10N::get('lib'); + $l = OC_L10N::get('lib'); return $l->l($dateOnly ? 'date' : 'datetime', $timestamp); } /** - * check if the current server configuration is suitable for ownCloud + * @brief check if the current server configuration is suitable for ownCloud * @return array arrays with error messages and hints */ public static function checkServer() { // Assume that if checkServer() succeeded before in this session, then all is fine. - if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) + if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) { return array(); + } - $errors=array(); + $errors = array(); $defaults = new \OC_Defaults(); - $web_server_restart= false; + $webServerRestart = false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect') and !is_callable('oci_connect')) { - $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.', - 'hint'=>'');//TODO: sane hint - $web_server_restart= true; + $errors[] = array( + 'error'=>'No database drivers (sqlite, mysql, or postgresql) installed.', + 'hint'=>'' //TODO: sane hint + ); + $webServerRestart = true; } //common hint for all file permissons error messages $permissionsHint = 'Permissions can usually be fixed by ' - .'giving the webserver write access to the root directory.'; + .'giving the webserver write access to the root directory.'; // Check if config folder is writable. if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { $errors[] = array( 'error' => "Can't write into config directory", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the config directory.' + .'giving the webserver write access to the config directory.' ); } @@ -208,7 +228,8 @@ class OC_Util { $errors[] = array( 'error' => "Can't write into apps directory", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the apps directory ' + .'giving the webserver write access to the apps directory ' .'or disabling the appstore in the config file.' ); } @@ -223,94 +244,131 @@ class OC_Util { $errors[] = array( 'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the root directory.' + .'giving the webserver write access to the root directory.' ); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud', - 'hint'=>$permissionsHint); + $errors[] = array( + 'error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud', + 'hint'=>$permissionsHint + ); } else { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); } + + $moduleHint = "Please ask your server administrator to install the module."; // check if all required php modules are present if(!class_exists('ZipArchive')) { - $errors[]=array('error'=>'PHP module zip not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module zip not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!class_exists('DOMDocument')) { - $errors[] = array('error' => 'PHP module dom not installed.', - 'hint' => 'Please ask your server administrator to install the module.'); - $web_server_restart =true; + $errors[] = array( + 'error' => 'PHP module dom not installed.', + 'hint' => $moduleHint + ); + $webServerRestart =true; } if(!function_exists('xml_parser_create')) { - $errors[] = array('error' => 'PHP module libxml not installed.', - 'hint' => 'Please ask your server administrator to install the module.'); - $web_server_restart =true; + $errors[] = array( + 'error' => 'PHP module libxml not installed.', + 'hint' => $moduleHint + ); + $webServerRestart = true; } if(!function_exists('mb_detect_encoding')) { - $errors[]=array('error'=>'PHP module mb multibyte not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module mb multibyte not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('ctype_digit')) { - $errors[]=array('error'=>'PHP module ctype is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module ctype is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('json_encode')) { - $errors[]=array('error'=>'PHP module JSON is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module JSON is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!extension_loaded('gd') || !function_exists('gd_info')) { - $errors[]=array('error'=>'PHP module GD is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module GD is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('gzencode')) { - $errors[]=array('error'=>'PHP module zlib is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module zlib is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('iconv')) { - $errors[]=array('error'=>'PHP module iconv is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module iconv is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('simplexml_load_string')) { - $errors[]=array('error'=>'PHP module SimpleXML is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module SimpleXML is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } - if(floatval(phpversion())<5.3) { - $errors[]=array('error'=>'PHP 5.3 is required.', + if(floatval(phpversion()) < 5.3) { + $errors[] = array( + 'error'=>'PHP 5.3 is required.', 'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.' - .' PHP 5.2 is no longer supported by ownCloud and the PHP community.'); - $web_server_restart=true; + .' PHP 5.2 is no longer supported by ownCloud and the PHP community.' + ); + $webServerRestart = true; } if(!defined('PDO::ATTR_DRIVER_NAME')) { - $errors[]=array('error'=>'PHP PDO module is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP PDO module is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if (((strtolower(@ini_get('safe_mode')) == 'on') || (strtolower(@ini_get('safe_mode')) == 'yes') || (strtolower(@ini_get('safe_mode')) == 'true') || (ini_get("safe_mode") == 1 ))) { - $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.', - 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.', + 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. ' + .'Please ask your server administrator to disable it in php.ini or in your webserver config.' + ); + $webServerRestart = true; } if (get_magic_quotes_gpc() == 1 ) { - $errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.', - 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.', + 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. ' + .'Please ask your server administrator to disable it in php.ini or in your webserver config.' + ); + $webServerRestart = true; } - if($web_server_restart) { - $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?', - 'hint'=>'Please ask your server administrator to restart the web server.'); + if($webServerRestart) { + $errors[] = array( + 'error'=>'PHP modules have been installed, but they are still listed as missing?', + 'hint'=>'Please ask your server administrator to restart the web server.' + ); } // Cache the result of this function @@ -330,20 +388,25 @@ class OC_Util { } else { $permissionsModHint = 'Please change the permissions to 0770 so that the directory' .' cannot be listed by other users.'; - $prems = substr(decoct(@fileperms($dataDirectory)), -3); - if (substr($prems, -1) != '0') { + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, -1) != '0') { OC_Helper::chmodr($dataDirectory, 0770); clearstatcache(); - $prems = substr(decoct(@fileperms($dataDirectory)), -3); - if (substr($prems, 2, 1) != '0') { - $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users', - 'hint' => $permissionsModHint); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, 2, 1) != '0') { + $errors[] = array( + 'error' => 'Data directory ('.$dataDirectory.') is readable for other users', + 'hint' => $permissionsModHint + ); } } } return $errors; } + /** + * @return void + */ public static function displayLoginPage($errors = array()) { $parameters = array(); foreach( $errors as $key => $value ) { @@ -357,8 +420,8 @@ class OC_Util { $parameters['user_autofocus'] = true; } if (isset($_REQUEST['redirect_url'])) { - $redirect_url = $_REQUEST['redirect_url']; - $parameters['redirect_url'] = urlencode($redirect_url); + $redirectUrl = $_REQUEST['redirect_url']; + $parameters['redirect_url'] = urlencode($redirectUrl); } $parameters['alt_login'] = OC_App::getAlternativeLogIns(); @@ -367,7 +430,8 @@ class OC_Util { /** - * Check if the app is enabled, redirects to home if not + * @brief Check if the app is enabled, redirects to home if not + * @return void */ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { @@ -379,18 +443,21 @@ class OC_Util { /** * Check if the user is logged in, redirects to home if not. With * redirect URL parameter to the request URI. + * @return void */ public static function checkLoggedIn() { // Check if we are a user if( !OC_User::isLoggedIn()) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', - array('redirect_url' => OC_Request::requestUri()))); + array('redirectUrl' => OC_Request::requestUri()) + )); exit(); } } /** - * Check if the user is a admin, redirects to home if not + * @brief Check if the user is a admin, redirects to home if not + * @return void */ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { @@ -400,7 +467,7 @@ class OC_Util { } /** - * Check if the user is a subadmin, redirects to home if not + * @brief 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() { @@ -412,7 +479,8 @@ class OC_Util { } /** - * Redirect to the user default page + * @brief Redirect to the user default page + * @return void */ public static function redirectToDefaultPage() { if(isset($_REQUEST['redirect_url'])) { @@ -420,13 +488,11 @@ class OC_Util { } else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) { $location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' ); - } - else { - $defaultpage = OC_Appconfig::getValue('core', 'defaultpage'); - if ($defaultpage) { - $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage); - } - else { + } else { + $defaultPage = OC_Appconfig::getValue('core', 'defaultpage'); + if ($defaultPage) { + $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultPage); + } else { $location = OC_Helper::linkToAbsolute( 'files', 'index.php' ); } } @@ -435,19 +501,19 @@ class OC_Util { exit(); } - /** - * get an id unique for this instance - * @return string - */ - public static function getInstanceId() { - $id = OC_Config::getValue('instanceid', null); - if(is_null($id)) { - // We need to guarantee at least one letter in instanceid so it can be used as the session_name - $id = 'oc' . OC_Util::generate_random_bytes(10); - OC_Config::setValue('instanceid', $id); - } - return $id; - } + /** + * @brief get an id unique for this instance + * @return string + */ + public static function getInstanceId() { + $id = OC_Config::getValue('instanceid', null); + if(is_null($id)) { + // We need to guarantee at least one letter in instanceid so it can be used as the session_name + $id = 'oc' . self::generateRandomBytes(10); + OC_Config::setValue('instanceid', $id); + } + return $id; + } /** * @brief Static lifespan (in seconds) when a request token expires. @@ -476,7 +542,7 @@ class OC_Util { // Check if a token exists if(!\OC::$session->exists('requesttoken')) { // No valid token found, generate a new one. - $requestToken = self::generate_random_bytes(20); + $requestToken = self::generateRandomBytes(20); \OC::$session->set('requesttoken', $requestToken); } else { // Valid token already exists, send it @@ -497,11 +563,11 @@ class OC_Util { } if(isset($_GET['requesttoken'])) { - $token=$_GET['requesttoken']; + $token = $_GET['requesttoken']; } elseif(isset($_POST['requesttoken'])) { - $token=$_POST['requesttoken']; + $token = $_POST['requesttoken']; } elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) { - $token=$_SERVER['HTTP_REQUESTTOKEN']; + $token = $_SERVER['HTTP_REQUESTTOKEN']; } else { //no token found. return false; @@ -519,11 +585,12 @@ class OC_Util { /** * @brief Check an ajax get/post call if the request token is valid. exit if not. - * Todo: Write howto + * @todo Write howto + * @return void */ public static function callCheck() { if(!OC_Util::isCallRegistered()) { - exit; + exit(); } } @@ -562,12 +629,13 @@ class OC_Util { } /** - * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http + * @brief Check if the htaccess file is working by creating a test file in the data directory and trying to access via http + * @return bool */ - public static function ishtaccessworking() { + public static function isHtaccessWorking() { // testdata - $filename='/htaccesstest.txt'; - $testcontent='testcontent'; + $filename = '/htaccesstest.txt'; + $testcontent = 'testcontent'; // creating a test file $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename; @@ -591,19 +659,20 @@ class OC_Util { // does it work ? if($content==$testcontent) { - return(false); - }else{ - return(true); + return false; + } else { + return true; } } /** - * we test if webDAV is working properly - * + * @brief test if webDAV is working properly + * @return bool + * @description * The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND * the web server it self is setup properly. * - * Why not an authenticated PROFIND and other verbs? + * Why not an authenticated PROPFIND and other verbs? * - We don't have the password available * - We have no idea about other auth methods implemented (e.g. OAuth with Bearer header) * @@ -617,7 +686,7 @@ class OC_Util { ); // save the old timeout so that we can restore it later - $old_timeout=ini_get("default_socket_timeout"); + $oldTimeout = ini_get("default_socket_timeout"); // use a 5 sec timeout for the check. Should be enough for local requests. ini_set("default_socket_timeout", 5); @@ -631,15 +700,15 @@ class OC_Util { try { // test PROPFIND $client->propfind('', array('{DAV:}resourcetype')); - } catch(\Sabre_DAV_Exception_NotAuthenticated $e) { + } catch (\Sabre_DAV_Exception_NotAuthenticated $e) { $return = true; - } catch(\Exception $e) { + } catch (\Exception $e) { OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e->getMessage(). ' ('.get_class($e).')', OC_Log::WARN); $return = false; } // restore the original timeout - ini_set("default_socket_timeout", $old_timeout); + ini_set("default_socket_timeout", $oldTimeout); return $return; } @@ -647,8 +716,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. + * @return bool */ - public static function issetlocaleworking() { + public static function isSetlocaleWorking() { // setlocale test is pointless on Windows if (OC_Util::runningOnWindows() ) { return true; @@ -662,7 +732,7 @@ class OC_Util { } /** - * Check if the PHP module fileinfo is loaded. + * @brief Check if the PHP module fileinfo is loaded. * @return bool */ public static function fileInfoLoaded() { @@ -670,7 +740,8 @@ class OC_Util { } /** - * Check if the ownCloud server can connect to the internet + * @brief Check if the ownCloud server can connect to the internet + * @return bool */ public static function isInternetConnectionWorking() { // in case there is no internet connection on purpose return false @@ -683,30 +754,29 @@ class OC_Util { if ($connected) { fclose($connected); return true; - }else{ - + } else { // second try in case one server is down $connected = @fsockopen("apps.owncloud.com", 80); if ($connected) { fclose($connected); return true; - }else{ + } else { return false; } - } - } /** - * Check if the connection to the internet is disabled on purpose + * @brief Check if the connection to the internet is disabled on purpose + * @return bool */ public static function isInternetConnectionEnabled(){ return \OC_Config::getValue("has_internet_connection", true); } /** - * clear all levels of output buffering + * @brief clear all levels of output buffering + * @return void */ public static function obEnd(){ while (ob_get_level()) { @@ -719,44 +789,44 @@ 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 + * Please also update secureRNGAvailable if you change something here */ - public static function generate_random_bytes($length = 30) { - + public static function generateRandomBytes($length = 30) { // Try to use openssl_random_pseudo_bytes - if(function_exists('openssl_random_pseudo_bytes')) { - $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); + if (function_exists('openssl_random_pseudo_bytes')) { + $pseudoByte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); if($strong == true) { - return substr($pseudo_byte, 0, $length); // Truncate it to match the length + return substr($pseudoByte, 0, $length); // Truncate it to match the length } } // Try to use /dev/urandom - $fp = @file_get_contents('/dev/urandom', false, null, 0, $length); - if ($fp !== false) { - $string = substr(bin2hex($fp), 0, $length); - return $string; + if (!self::runningOnWindows()) { + $fp = @file_get_contents('/dev/urandom', false, null, 0, $length); + if ($fp !== false) { + $string = substr(bin2hex($fp), 0, $length); + return $string; + } } // Fallback to mt_rand() $characters = '0123456789'; $characters .= 'abcdefghijklmnopqrstuvwxyz'; $charactersLength = strlen($characters)-1; - $pseudo_byte = ""; + $pseudoByte = ""; // Select some random characters for ($i = 0; $i < $length; $i++) { - $pseudo_byte .= $characters[mt_rand(0, $charactersLength)]; + $pseudoByte .= $characters[mt_rand(0, $charactersLength)]; } - return $pseudo_byte; + return $pseudoByte; } /** * @brief Checks if a secure random number generator is available * @return bool */ - public static function secureRNG_available() { - + public static function secureRNGAvailable() { // Check openssl_random_pseudo_bytes if(function_exists('openssl_random_pseudo_bytes')) { openssl_random_pseudo_bytes(1, $strong); @@ -766,9 +836,11 @@ class OC_Util { } // Check /dev/urandom - $fp = @file_get_contents('/dev/urandom', false, null, 0, 1); - if ($fp !== false) { - return true; + if (!self::runningOnWindows()) { + $fp = @file_get_contents('/dev/urandom', false, null, 0, 1); + if ($fp !== false) { + return true; + } } return false; @@ -781,11 +853,8 @@ class OC_Util { * 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')) { - + if (function_exists('curl_init')) { $curl = curl_init(); curl_setopt($curl, CURLOPT_HEADER, 0); @@ -796,10 +865,10 @@ class OC_Util { curl_setopt($curl, CURLOPT_MAXREDIRS, 10); curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); - if(OC_Config::getValue('proxy', '')<>'') { + if(OC_Config::getValue('proxy', '') != '') { curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy')); } - if(OC_Config::getValue('proxyuserpwd', '')<>'') { + if(OC_Config::getValue('proxyuserpwd', '') != '') { curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); } $data = curl_exec($curl); @@ -808,7 +877,7 @@ class OC_Util { } else { $contextArray = null; - if(OC_Config::getValue('proxy', '')<>'') { + if(OC_Config::getValue('proxy', '') != '') { $contextArray = array( 'http' => array( 'timeout' => 10, @@ -823,11 +892,10 @@ class OC_Util { ); } - $ctx = stream_context_create( $contextArray ); - $data=@file_get_contents($url, 0, $ctx); + $data = @file_get_contents($url, 0, $ctx); } return $data; @@ -840,7 +908,6 @@ class OC_Util { return (substr(PHP_OS, 0, 3) === "WIN"); } - /** * Handles the case that there may not be a theme, then check if a "default" * theme exists and take that one @@ -850,20 +917,19 @@ class OC_Util { $theme = OC_Config::getValue("theme", ''); if($theme === '') { - if(is_dir(OC::$SERVERROOT . '/themes/default')) { $theme = 'default'; } - } return $theme; } /** - * Clear the opcode cache if one exists + * @brief Clear the opcode cache if one exists * This is necessary for writing to the config file * in case the opcode cache doesn't revalidate files + * @return void */ public static function clearOpcodeCache() { // APC @@ -902,8 +968,10 @@ class OC_Util { return $value; } - public static function basename($file) - { + /** + * @return string + */ + public static function basename($file) { $file = rtrim($file, '/'); $t = explode('/', $file); return array_pop($t); diff --git a/settings/admin.php b/settings/admin.php index 10e239204f2..d721593eb77 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::ishtaccessworking(); +$htaccessworking=OC_Util::isHtaccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; @@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); -$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking()); +$tmpl->assign('islocaleworking', OC_Util::isSetlocaleWorking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); diff --git a/tests/lib/db.php b/tests/lib/db.php index 51edbf7b309..1977025cf12 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -15,7 +15,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function setUp() { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( self::$schema_file, $content ); diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index c2e55eabf4b..7de90c047ca 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( $this->schema_file, $content ); diff --git a/tests/lib/util.php b/tests/lib/util.php index 13aa49c8c6f..d607a3e7725 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -71,8 +71,8 @@ class Test_Util extends PHPUnit_Framework_TestCase { $this->assertTrue(\OC_Util::isInternetConnectionEnabled()); } - function testGenerate_random_bytes() { - $result = strlen(OC_Util::generate_random_bytes(59)); + function testGenerateRandomBytes() { + $result = strlen(OC_Util::generateRandomBytes(59)); $this->assertEquals(59, $result); } -- cgit v1.2.3 From 4574c5cf5cbb9efc4f787b264842573540f88439 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 15 Aug 2013 16:13:01 +0200 Subject: check if ->resource is a resource --- lib/image.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/image.php b/lib/image.php index 53ffb24d18c..840b744ad72 100644 --- a/lib/image.php +++ b/lib/image.php @@ -496,8 +496,10 @@ class OC_Image { return false; } $this->resource = @imagecreatefromstring($str); - imagealphablending($this->resource, false); - imagesavealpha($this->resource, true); + if(is_resource($this->resource)) { + imagealphablending($this->resource, false); + imagesavealpha($this->resource, true); + } if(!$this->resource) { OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG); -- cgit v1.2.3 From a0b7bf78a6e1c269adc8ee1c84b72a8d205a6f28 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 16 Aug 2013 19:05:07 +0200 Subject: Remove disconnect function from OC_DB --- lib/db.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib') diff --git a/lib/db.php b/lib/db.php index ebd012c72f8..f090f474243 100644 --- a/lib/db.php +++ b/lib/db.php @@ -329,18 +329,6 @@ class OC_DB { self::$connection->commit(); } - /** - * @brief Disconnect - * - * This is good bye, good bye, yeah! - */ - public static function disconnect() { - // Cut connection if required - if(self::$connection) { - self::$connection->close(); - } - } - /** * @brief saves database schema to xml file * @param string $file name of file -- cgit v1.2.3 From d43b4c52ae0169d80e10532db4ce2103f211cd56 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 17 Aug 2013 10:57:31 +0200 Subject: also emit hooks for views that are a subfolder of the user folder --- lib/files/view.php | 89 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 32 deletions(-) (limited to 'lib') diff --git a/lib/files/view.php b/lib/files/view.php index c9727fe4984..21c902ccc4a 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -267,18 +267,18 @@ class View { $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path)); if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) and Filesystem::isValidPath($path) - and !Filesystem::isFileBlacklisted($path) + and !Filesystem::isFileBlacklisted($path) ) { $path = $this->getRelativePath($absolutePath); $exists = $this->file_exists($path); $run = true; - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) { + if ($this->shouldEmitHooks($path)) { if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_create, array( - Filesystem::signal_param_path => $path, + Filesystem::signal_param_path => $this->getHookPath($path), Filesystem::signal_param_run => &$run ) ); @@ -287,7 +287,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path, + Filesystem::signal_param_path => $this->getHookPath($path), Filesystem::signal_param_run => &$run ) ); @@ -300,18 +300,18 @@ class View { list ($count, $result) = \OC_Helper::streamCopy($data, $target); fclose($target); fclose($data); - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) { + if ($this->shouldEmitHooks($path) && $result !== false) { if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_create, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } \OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count); @@ -353,21 +353,21 @@ class View { return false; } $run = true; - if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) { + if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) { // if it was a rename from a part file to a regular file it was a write and not a rename operation \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); - } elseif ($this->fakeRoot == Filesystem::getRoot()) { + } elseif ($this->shouldEmitHooks()) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_rename, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2, + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -407,22 +407,22 @@ class View { } } } - if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) { + if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) { // if it was a rename from a part file to a regular file it was a write and not a rename operation \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), ) ); - } elseif ($this->fakeRoot == Filesystem::getRoot() && $result !== false) { + } elseif ($this->shouldEmitHooks() && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_rename, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2 + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2) ) ); } @@ -454,13 +454,13 @@ class View { } $run = true; $exists = $this->file_exists($path2); - if ($this->fakeRoot == Filesystem::getRoot()) { + if ($this->shouldEmitHooks()) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_copy, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2, + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -469,7 +469,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_create, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -479,7 +479,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -510,26 +510,26 @@ class View { list($count, $result) = \OC_Helper::streamCopy($source, $target); } } - if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) { + if ($this->shouldEmitHooks() && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_copy, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2 + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2) ) ); if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_create, - array(Filesystem::signal_param_path => $path2) + array(Filesystem::signal_param_path => $this->getHookPath($path2)) ); } \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, - array(Filesystem::signal_param_path => $path2) + array(Filesystem::signal_param_path => $this->getHookPath($path2)) ); } return $result; @@ -620,11 +620,11 @@ class View { if ($path == null) { return false; } - if (Filesystem::$loaded && $this->fakeRoot == Filesystem::getRoot()) { + if ($this->shouldEmitHooks($path)) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_read, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); @@ -658,7 +658,7 @@ class View { $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path)); if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and Filesystem::isValidPath($path) - and !Filesystem::isFileBlacklisted($path) + and !Filesystem::isFileBlacklisted($path) ) { $path = $this->getRelativePath($absolutePath); if ($path == null) { @@ -674,7 +674,7 @@ class View { $result = $storage->$operation($internalPath); } $result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result); - if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) { + if ($this->shouldEmitHooks($path) && $result !== false) { if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open $this->runHooks($hooks, $path, true); } @@ -685,10 +685,35 @@ class View { return null; } + /** + * get the path relative to the default root for hook usage + * + * @param string $path + * @return string + */ + private function getHookPath($path) { + if (!Filesystem::getView()) { + return $path; + } + return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path)); + } + + private function shouldEmitHooks($path = '') { + if ($path && Cache\Scanner::isPartialFile($path)) { + return false; + } + if (!Filesystem::$loaded) { + return false; + } + $defaultRoot = Filesystem::getRoot(); + return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot); + } + private function runHooks($hooks, $path, $post = false) { + $path = $this->getHookPath($path); $prefix = ($post) ? 'post_' : ''; $run = true; - if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) { + if ($this->shouldEmitHooks($path)) { foreach ($hooks as $hook) { if ($hook != 'read') { \OC_Hook::emit( -- cgit v1.2.3 From fde9cabe9774b67e88ee8aa8fa39fe044fe2da2f Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 17 Aug 2013 11:16:48 +0200 Subject: initial import of appframework --- lib/appframework/app.php | 97 ++++ lib/appframework/controller/controller.php | 154 ++++++ lib/appframework/core/api.php | 524 +++++++++++++++++++++ .../dependencyinjection/dicontainer.php | 125 +++++ lib/appframework/http/dispatcher.php | 98 ++++ lib/appframework/http/downloadresponse.php | 51 ++ lib/appframework/http/http.php | 208 ++++++++ lib/appframework/http/jsonresponse.php | 74 +++ lib/appframework/http/redirectresponse.php | 54 +++ lib/appframework/http/request.php | 217 +++++++++ lib/appframework/http/response.php | 169 +++++++ lib/appframework/http/templateresponse.php | 126 +++++ lib/appframework/middleware/middleware.php | 100 ++++ .../middleware/middlewaredispatcher.php | 159 +++++++ .../middleware/security/securityexception.php | 41 ++ .../middleware/security/securitymiddleware.php | 141 ++++++ lib/appframework/routing/routeactionhandler.php | 42 ++ lib/appframework/routing/routeconfig.php | 186 ++++++++ .../utility/methodannotationreader.php | 61 +++ lib/appframework/utility/timefactory.php | 42 ++ tests/lib/appframework/AppTest.php | 107 +++++ tests/lib/appframework/classloader.php | 45 ++ .../lib/appframework/controller/ControllerTest.php | 161 +++++++ .../dependencyinjection/DIContainerTest.php | 98 ++++ tests/lib/appframework/http/DispatcherTest.php | 218 +++++++++ .../lib/appframework/http/DownloadResponseTest.php | 51 ++ tests/lib/appframework/http/HttpTest.php | 87 ++++ tests/lib/appframework/http/JSONResponseTest.php | 96 ++++ .../lib/appframework/http/RedirectResponseTest.php | 55 +++ tests/lib/appframework/http/RequestTest.php | 78 +++ tests/lib/appframework/http/ResponseTest.php | 119 +++++ .../lib/appframework/http/TemplateResponseTest.php | 157 ++++++ .../middleware/MiddlewareDispatcherTest.php | 280 +++++++++++ .../lib/appframework/middleware/MiddlewareTest.php | 82 ++++ .../middleware/security/SecurityMiddlewareTest.php | 388 +++++++++++++++ tests/lib/appframework/routing/RoutingTest.php | 214 +++++++++ .../utility/MethodAnnotationReaderTest.php | 58 +++ 37 files changed, 4963 insertions(+) create mode 100644 lib/appframework/app.php create mode 100644 lib/appframework/controller/controller.php create mode 100644 lib/appframework/core/api.php create mode 100644 lib/appframework/dependencyinjection/dicontainer.php create mode 100644 lib/appframework/http/dispatcher.php create mode 100644 lib/appframework/http/downloadresponse.php create mode 100644 lib/appframework/http/http.php create mode 100644 lib/appframework/http/jsonresponse.php create mode 100644 lib/appframework/http/redirectresponse.php create mode 100644 lib/appframework/http/request.php create mode 100644 lib/appframework/http/response.php create mode 100644 lib/appframework/http/templateresponse.php create mode 100644 lib/appframework/middleware/middleware.php create mode 100644 lib/appframework/middleware/middlewaredispatcher.php create mode 100644 lib/appframework/middleware/security/securityexception.php create mode 100644 lib/appframework/middleware/security/securitymiddleware.php create mode 100644 lib/appframework/routing/routeactionhandler.php create mode 100644 lib/appframework/routing/routeconfig.php create mode 100644 lib/appframework/utility/methodannotationreader.php create mode 100644 lib/appframework/utility/timefactory.php create mode 100644 tests/lib/appframework/AppTest.php create mode 100644 tests/lib/appframework/classloader.php create mode 100644 tests/lib/appframework/controller/ControllerTest.php create mode 100644 tests/lib/appframework/dependencyinjection/DIContainerTest.php create mode 100644 tests/lib/appframework/http/DispatcherTest.php create mode 100644 tests/lib/appframework/http/DownloadResponseTest.php create mode 100644 tests/lib/appframework/http/HttpTest.php create mode 100644 tests/lib/appframework/http/JSONResponseTest.php create mode 100644 tests/lib/appframework/http/RedirectResponseTest.php create mode 100644 tests/lib/appframework/http/RequestTest.php create mode 100644 tests/lib/appframework/http/ResponseTest.php create mode 100644 tests/lib/appframework/http/TemplateResponseTest.php create mode 100644 tests/lib/appframework/middleware/MiddlewareDispatcherTest.php create mode 100644 tests/lib/appframework/middleware/MiddlewareTest.php create mode 100644 tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php create mode 100644 tests/lib/appframework/routing/RoutingTest.php create mode 100644 tests/lib/appframework/utility/MethodAnnotationReaderTest.php (limited to 'lib') diff --git a/lib/appframework/app.php b/lib/appframework/app.php new file mode 100644 index 00000000000..6224b858bbf --- /dev/null +++ b/lib/appframework/app.php @@ -0,0 +1,97 @@ +. + * + */ + + +namespace OC\AppFramework; + +use OC\AppFramework\DependencyInjection\DIContainer; + + +/** + * Entry point for every request in your app. You can consider this as your + * public static void main() method + * + * Handles all the dependency injection, controllers and output flow + */ +class App { + + + /** + * Shortcut for calling a controller method and printing the result + * @param string $controllerName the name of the controller under which it is + * stored in the DI container + * @param string $methodName the method that you want to call + * @param array $urlParams an array with variables extracted from the routes + * @param DIContainer $container an instance of a pimple container. + */ + public static function main($controllerName, $methodName, array $urlParams, + DIContainer $container) { + $container['urlParams'] = $urlParams; + $controller = $container[$controllerName]; + + // initialize the dispatcher and run all the middleware before the controller + $dispatcher = $container['Dispatcher']; + + list($httpHeaders, $responseHeaders, $output) = + $dispatcher->dispatch($controller, $methodName); + + if(!is_null($httpHeaders)) { + header($httpHeaders); + } + + foreach($responseHeaders as $name => $value) { + header($name . ': ' . $value); + } + + if(!is_null($output)) { + header('Content-Length: ' . strlen($output)); + print($output); + } + + } + + /** + * Shortcut for calling a controller method and printing the result. + * Similar to App:main except that no headers will be sent. + * This should be used for example when registering sections via + * \OC\AppFramework\Core\API::registerAdmin() + * + * @param string $controllerName the name of the controller under which it is + * stored in the DI container + * @param string $methodName the method that you want to call + * @param array $urlParams an array with variables extracted from the routes + * @param DIContainer $container an instance of a pimple container. + */ + public static function part($controllerName, $methodName, array $urlParams, + DIContainer $container){ + + $container['urlParams'] = $urlParams; + $controller = $container[$controllerName]; + + $dispatcher = $container['Dispatcher']; + + list(, , $output) = $dispatcher->dispatch($controller, $methodName); + return $output; + } + +} diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php new file mode 100644 index 00000000000..3e8166050d7 --- /dev/null +++ b/lib/appframework/controller/controller.php @@ -0,0 +1,154 @@ +. + * + */ + + +namespace OC\AppFramework\Controller; + +use OC\AppFramework\Http\TemplateResponse; +use OC\AppFramework\Http\Request; +use OC\AppFramework\Core\API; + + +/** + * Base class to inherit your controllers from + */ +abstract class Controller { + + /** + * @var API instance of the api layer + */ + protected $api; + + protected $request; + + /** + * @param API $api an api wrapper instance + * @param Request $request an instance of the request + */ + public function __construct(API $api, Request $request){ + $this->api = $api; + $this->request = $request; + } + + + /** + * Lets you access post and get parameters by the index + * @param string $key the key which you want to access in the URL Parameter + * placeholder, $_POST or $_GET array. + * The priority how they're returned is the following: + * 1. URL parameters + * 2. POST parameters + * 3. GET parameters + * @param mixed $default If the key is not found, this value will be returned + * @return mixed the content of the array + */ + public function params($key, $default=null){ + return isset($this->request->parameters[$key]) + ? $this->request->parameters[$key] + : $default; + } + + + /** + * Returns all params that were received, be it from the request + * (as GET or POST) or throuh the URL by the route + * @return array the array with all parameters + */ + public function getParams() { + return $this->request->parameters; + } + + + /** + * Returns the method of the request + * @return string the method of the request (POST, GET, etc) + */ + public function method() { + return $this->request->method; + } + + + /** + * Shortcut for accessing an uploaded file through the $_FILES array + * @param string $key the key that will be taken from the $_FILES array + * @return array the file in the $_FILES element + */ + public function getUploadedFile($key) { + return isset($this->request->files[$key]) ? $this->request->files[$key] : null; + } + + + /** + * Shortcut for getting env variables + * @param string $key the key that will be taken from the $_ENV array + * @return array the value in the $_ENV element + */ + public function env($key) { + return isset($this->request->env[$key]) ? $this->request->env[$key] : null; + } + + + /** + * Shortcut for getting session variables + * @param string $key the key that will be taken from the $_SESSION array + * @return array the value in the $_SESSION element + */ + public function session($key) { + return isset($this->request->session[$key]) ? $this->request->session[$key] : null; + } + + + /** + * Shortcut for getting cookie variables + * @param string $key the key that will be taken from the $_COOKIE array + * @return array the value in the $_COOKIE element + */ + public function cookie($key) { + return isset($this->request->cookies[$key]) ? $this->request->cookies[$key] : null; + } + + + /** + * Shortcut for rendering a template + * @param string $templateName the name of the template + * @param array $params the template parameters in key => value structure + * @param string $renderAs user renders a full page, blank only your template + * admin an entry in the admin settings + * @param array $headers set additional headers in name/value pairs + * @return \OC\AppFramework\Http\TemplateResponse containing the page + */ + public function render($templateName, array $params=array(), + $renderAs='user', array $headers=array()){ + $response = new TemplateResponse($this->api, $templateName); + $response->setParams($params); + $response->renderAs($renderAs); + + foreach($headers as $name => $value){ + $response->addHeader($name, $value); + } + + return $response; + } + + +} diff --git a/lib/appframework/core/api.php b/lib/appframework/core/api.php new file mode 100644 index 00000000000..eb8ee01e5db --- /dev/null +++ b/lib/appframework/core/api.php @@ -0,0 +1,524 @@ +. + * + */ + + +namespace OC\AppFramework\Core; + + +/** + * This is used to wrap the owncloud static api calls into an object to make the + * code better abstractable for use in the dependency injection container + * + * Should you find yourself in need for more methods, simply inherit from this + * class and add your methods + */ +class API { + + private $appName; + + /** + * constructor + * @param string $appName the name of your application + */ + public function __construct($appName){ + $this->appName = $appName; + } + + + /** + * used to return the appname of the set application + * @return string the name of your application + */ + public function getAppName(){ + return $this->appName; + } + + + /** + * Creates a new navigation entry + * @param array $entry containing: id, name, order, icon and href key + */ + public function addNavigationEntry(array $entry){ + \OCP\App::addNavigationEntry($entry); + } + + + /** + * Gets the userid of the current user + * @return string the user id of the current user + */ + public function getUserId(){ + return \OCP\User::getUser(); + } + + + /** + * Sets the current navigation entry to the currently running app + */ + public function activateNavigationEntry(){ + \OCP\App::setActiveNavigationEntry($this->appName); + } + + + /** + * Adds a new javascript file + * @param string $scriptName the name of the javascript in js/ without the suffix + * @param string $appName the name of the app, defaults to the current one + */ + public function addScript($scriptName, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + \OCP\Util::addScript($appName, $scriptName); + } + + + /** + * Adds a new css file + * @param string $styleName the name of the css file in css/without the suffix + * @param string $appName the name of the app, defaults to the current one + */ + public function addStyle($styleName, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + \OCP\Util::addStyle($appName, $styleName); + } + + + /** + * shorthand for addScript for files in the 3rdparty directory + * @param string $name the name of the file without the suffix + */ + public function add3rdPartyScript($name){ + \OCP\Util::addScript($this->appName . '/3rdparty', $name); + } + + + /** + * shorthand for addStyle for files in the 3rdparty directory + * @param string $name the name of the file without the suffix + */ + public function add3rdPartyStyle($name){ + \OCP\Util::addStyle($this->appName . '/3rdparty', $name); + } + + /** + * Looks up a systemwide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getSystemValue($key){ + return \OCP\Config::getSystemValue($key, ''); + } + + + /** + * Sets a new systemwide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + public function setSystemValue($key, $value){ + return \OCP\Config::setSystemValue($key, $value); + } + + + /** + * Looks up an appwide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getAppValue($key, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + return \OCP\Config::getAppValue($appName, $key, ''); + } + + + /** + * Writes a new appwide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + public function setAppValue($key, $value, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + return \OCP\Config::setAppValue($appName, $key, $value); + } + + + + /** + * Shortcut for setting a user defined value + * @param string $key the key under which the value is being stored + * @param string $value the value that you want to store + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + public function setUserValue($key, $value, $userId=null){ + if($userId === null){ + $userId = $this->getUserId(); + } + \OCP\Config::setUserValue($userId, $this->appName, $key, $value); + } + + + /** + * Shortcut for getting a user defined value + * @param string $key the key under which the value is being stored + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + public function getUserValue($key, $userId=null){ + if($userId === null){ + $userId = $this->getUserId(); + } + return \OCP\Config::getUserValue($userId, $this->appName, $key); + } + + + /** + * Returns the translation object + * @return \OC_L10N the translation object + */ + public function getTrans(){ + # TODO: use public api + return \OC_L10N::get($this->appName); + } + + + /** + * Used to abstract the owncloud database access away + * @param string $sql the sql query with ? placeholder for params + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \OCP\DB a query object + */ + public function prepareQuery($sql, $limit=null, $offset=null){ + return \OCP\DB::prepare($sql, $limit, $offset); + } + + + /** + * Used to get the id of the just inserted element + * @param string $tableName the name of the table where we inserted the item + * @return int the id of the inserted element + */ + public function getInsertId($tableName){ + return \OCP\DB::insertid($tableName); + } + + + /** + * Returns the URL for a route + * @param string $routeName the name of the route + * @param array $arguments an array with arguments which will be filled into the url + * @return string the url + */ + public function linkToRoute($routeName, $arguments=array()){ + return \OCP\Util::linkToRoute($routeName, $arguments); + } + + + /** + * Returns an URL for an image or file + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + */ + public function linkTo($file, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + return \OCP\Util::linkTo($appName, $file); + } + + + /** + * Returns the link to an image, like link to but only with prepending img/ + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + */ + public function imagePath($file, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + return \OCP\Util::imagePath($appName, $file); + } + + + /** + * Makes an URL absolute + * @param string $url the url + * @return string the absolute url + */ + public function getAbsoluteURL($url){ + # TODO: use public api + return \OC_Helper::makeURLAbsolute($url); + } + + + /** + * links to a file + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + * @deprecated replaced with linkToRoute() + * @return string the url + */ + public function linkToAbsolute($file, $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + return \OCP\Util::linkToAbsolute($appName, $file); + } + + + /** + * Checks if the current user is logged in + * @return bool true if logged in + */ + public function isLoggedIn(){ + return \OCP\User::isLoggedIn(); + } + + + /** + * Checks if a user is an admin + * @param string $userId the id of the user + * @return bool true if admin + */ + public function isAdminUser($userId){ + # TODO: use public api + return \OC_User::isAdminUser($userId); + } + + + /** + * Checks if a user is an subadmin + * @param string $userId the id of the user + * @return bool true if subadmin + */ + public function isSubAdminUser($userId){ + # TODO: use public api + return \OC_SubAdmin::isSubAdmin($userId); + } + + + /** + * Checks if the CSRF check was correct + * @return bool true if CSRF check passed + */ + public function passesCSRFCheck(){ + # TODO: use public api + return \OC_Util::isCallRegistered(); + } + + + /** + * Checks if an app is enabled + * @param string $appName the name of an app + * @return bool true if app is enabled + */ + public function isAppEnabled($appName){ + return \OCP\App::isEnabled($appName); + } + + + /** + * Writes a function into the error log + * @param string $msg the error message to be logged + * @param int $level the error level + */ + public function log($msg, $level=null){ + switch($level){ + case 'debug': + $level = \OCP\Util::DEBUG; + break; + case 'info': + $level = \OCP\Util::INFO; + break; + case 'warn': + $level = \OCP\Util::WARN; + break; + case 'fatal': + $level = \OCP\Util::FATAL; + break; + default: + $level = \OCP\Util::ERROR; + break; + } + \OCP\Util::writeLog($this->appName, $msg, $level); + } + + + /** + * Returns a template + * @param string $templateName the name of the template + * @param string $renderAs how it should be rendered + * @param string $appName the name of the app + * @return \OCP\Template a new template + */ + public function getTemplate($templateName, $renderAs='user', $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + + if($renderAs === 'blank'){ + return new \OCP\Template($appName, $templateName); + } else { + return new \OCP\Template($appName, $templateName, $renderAs); + } + } + + + /** + * turns an owncloud path into a path on the filesystem + * @param string path the path to the file on the oc filesystem + * @return string the filepath in the filesystem + */ + public function getLocalFilePath($path){ + # TODO: use public api + return \OC_Filesystem::getLocalFile($path); + } + + + /** + * used to return and open a new eventsource + * @return \OC_EventSource a new open EventSource class + */ + public function openEventSource(){ + # TODO: use public api + return new \OC_EventSource(); + } + + /** + * @brief connects a function to a hook + * @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, in another word, this is the + * name of the method that will be called when registered + * signal is emitted. + * @return bool, always true + */ + public function connectHook($signalClass, $signalName, $slotClass, $slotName) { + return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName); + } + + /** + * @brief Emits a signal. To get data from the slot use references! + * @param string $signalClass class name of emitter + * @param string $signalName name of signal + * @param array $params defautl: array() array with additional data + * @return bool, true if slots exists or false if not + */ + public function emitHook($signalClass, $signalName, $params = array()) { + return \OCP\Util::emitHook($signalClass, $signalName, $params); + } + + /** + * @brief clear hooks + * @param string $signalClass + * @param string $signalName + */ + public function clearHook($signalClass=false, $signalName=false) { + if ($signalClass) { + \OC_Hook::clear($signalClass, $signalName); + } + } + + /** + * Gets the content of an URL by using CURL or a fallback if it is not + * installed + * @param string $url the url that should be fetched + * @return string the content of the webpage + */ + public function getUrlContent($url) { + return \OC_Util::getUrlContent($url); + } + + /** + * Register a backgroundjob task + * @param string $className full namespace and class name of the class + * @param string $methodName the name of the static method that should be + * called + */ + public function addRegularTask($className, $methodName) { + \OCP\Backgroundjob::addRegularTask($className, $methodName); + } + + /** + * Tells ownCloud to include a template in the admin overview + * @param string $mainPath the path to the main php file without the php + * suffix, relative to your apps directory! not the template directory + * @param string $appName the name of the app, defaults to the current one + */ + public function registerAdmin($mainPath, $appName=null) { + if($appName === null){ + $appName = $this->appName; + } + + \OCP\App::registerAdmin($appName, $mainPath); + } + + /** + * Do a user login + * @param string $user the username + * @param string $password the password + * @return bool true if successful + */ + public function login($user, $password) { + return \OC_User::login($user, $password); + } + + /** + * @brief Loggs the user out including all the session data + * Logout, destroys session + */ + public function logout() { + return \OCP\User::logout(); + } + + /** + * get the filesystem info + * + * @param string $path + * @return array with the following keys: + * - size + * - mtime + * - mimetype + * - encrypted + * - versioned + */ + public function getFileInfo($path) { + return \OC\Files\Filesystem::getFileInfo($path); + } + + /** + * get the view + * + * @return OC\Files\View instance + */ + public function getView() { + return \OC\Files\Filesystem::getView(); + } +} diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php new file mode 100644 index 00000000000..34f64e72cb9 --- /dev/null +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -0,0 +1,125 @@ +. + * + */ + + +namespace OC\AppFramework\DependencyInjection; + +use OC\AppFramework\Http\Http; +use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\Dispatcher; +use OC\AppFramework\Core\API; +use OC\AppFramework\Middleware\MiddlewareDispatcher; +use OC\AppFramework\Middleware\Http\HttpMiddleware; +use OC\AppFramework\Middleware\Security\SecurityMiddleware; +use OC\AppFramework\Utility\TimeFactory; + +// register 3rdparty autoloaders +require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; + + +/** + * This class extends Pimple (http://pimple.sensiolabs.org/) for reusability + * To use this class, extend your own container from this. Should you require it + * you can overwrite the dependencies with your own classes by simply redefining + * a dependency + */ +class DIContainer extends \Pimple { + + + /** + * Put your class dependencies in here + * @param string $appName the name of the app + */ + public function __construct($appName){ + + $this['AppName'] = $appName; + + $this['API'] = $this->share(function($c){ + return new API($c['AppName']); + }); + + /** + * Http + */ + $this['Request'] = $this->share(function($c) { + $params = json_decode(file_get_contents('php://input'), true); + $params = is_array($params) ? $params: array(); + + return new Request( + array( + 'get' => $_GET, + 'post' => $_POST, + 'files' => $_FILES, + 'server' => $_SERVER, + 'env' => $_ENV, + 'session' => $_SESSION, + 'cookies' => $_COOKIE, + 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) + ? $_SERVER['REQUEST_METHOD'] + : null, + 'params' => $params, + 'urlParams' => $c['urlParams'] + ) + ); + }); + + $this['Protocol'] = $this->share(function($c){ + if(isset($_SERVER['SERVER_PROTOCOL'])) { + return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']); + } else { + return new Http($_SERVER); + } + }); + + $this['Dispatcher'] = $this->share(function($c) { + return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']); + }); + + + /** + * Middleware + */ + $this['SecurityMiddleware'] = $this->share(function($c){ + return new SecurityMiddleware($c['API'], $c['Request']); + }); + + $this['MiddlewareDispatcher'] = $this->share(function($c){ + $dispatcher = new MiddlewareDispatcher(); + $dispatcher->registerMiddleware($c['SecurityMiddleware']); + + return $dispatcher; + }); + + + /** + * Utilities + */ + $this['TimeFactory'] = $this->share(function($c){ + return new TimeFactory(); + }); + + + } + + +} diff --git a/lib/appframework/http/dispatcher.php b/lib/appframework/http/dispatcher.php new file mode 100644 index 00000000000..ab5644274fa --- /dev/null +++ b/lib/appframework/http/dispatcher.php @@ -0,0 +1,98 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + +use \OC\AppFramework\Controller\Controller; +use \OC\AppFramework\Middleware\MiddlewareDispatcher; + + +/** + * Class to dispatch the request to the middleware disptacher + */ +class Dispatcher { + + private $middlewareDispatcher; + private $protocol; + + + /** + * @param Http $protocol the http protocol with contains all status headers + * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which + * runs the middleware + */ + public function __construct(Http $protocol, + MiddlewareDispatcher $middlewareDispatcher) { + $this->protocol = $protocol; + $this->middlewareDispatcher = $middlewareDispatcher; + } + + + /** + * Handles a request and calls the dispatcher on the controller + * @param Controller $controller the controller which will be called + * @param string $methodName the method name which will be called on + * the controller + * @return array $array[0] contains a string with the http main header, + * $array[1] contains headers in the form: $key => value, $array[2] contains + * the response output + */ + public function dispatch(Controller $controller, $methodName) { + $out = array(null, array(), null); + + try { + + $this->middlewareDispatcher->beforeController($controller, + $methodName); + $response = $controller->$methodName(); + + + // if an exception appears, the middleware checks if it can handle the + // exception and creates a response. If no response is created, it is + // assumed that theres no middleware who can handle it and the error is + // thrown again + } catch(\Exception $exception){ + $response = $this->middlewareDispatcher->afterException( + $controller, $methodName, $exception); + } + + $response = $this->middlewareDispatcher->afterController( + $controller, $methodName, $response); + + // get the output which should be printed and run the after output + // middleware to modify the response + $output = $response->render(); + $out[2] = $this->middlewareDispatcher->beforeOutput( + $controller, $methodName, $output); + + // depending on the cache object the headers need to be changed + $out[0] = $this->protocol->getStatusHeader($response->getStatus(), + $response->getLastModified(), $response->getETag()); + $out[1] = $response->getHeaders(); + + return $out; + } + + +} diff --git a/lib/appframework/http/downloadresponse.php b/lib/appframework/http/downloadresponse.php new file mode 100644 index 00000000000..5a0db325fe6 --- /dev/null +++ b/lib/appframework/http/downloadresponse.php @@ -0,0 +1,51 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +/** + * Prompts the user to download the a file + */ +abstract class DownloadResponse extends Response { + + private $content; + private $filename; + private $contentType; + + /** + * Creates a response that prompts the user to download the file + * @param string $filename the name that the downloaded file should have + * @param string $contentType the mimetype that the downloaded file should have + */ + public function __construct($filename, $contentType) { + $this->filename = $filename; + $this->contentType = $contentType; + + $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); + $this->addHeader('Content-Type', $contentType); + } + + +} diff --git a/lib/appframework/http/http.php b/lib/appframework/http/http.php new file mode 100644 index 00000000000..73f32d13b38 --- /dev/null +++ b/lib/appframework/http/http.php @@ -0,0 +1,208 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +class Http { + + const STATUS_CONTINUE = 100; + const STATUS_SWITCHING_PROTOCOLS = 101; + const STATUS_PROCESSING = 102; + const STATUS_OK = 200; + const STATUS_CREATED = 201; + const STATUS_ACCEPTED = 202; + const STATUS_NON_AUTHORATIVE_INFORMATION = 203; + const STATUS_NO_CONTENT = 204; + const STATUS_RESET_CONTENT = 205; + const STATUS_PARTIAL_CONTENT = 206; + const STATUS_MULTI_STATUS = 207; + const STATUS_ALREADY_REPORTED = 208; + const STATUS_IM_USED = 226; + const STATUS_MULTIPLE_CHOICES = 300; + const STATUS_MOVED_PERMANENTLY = 301; + const STATUS_FOUND = 302; + const STATUS_SEE_OTHER = 303; + const STATUS_NOT_MODIFIED = 304; + const STATUS_USE_PROXY = 305; + const STATUS_RESERVED = 306; + const STATUS_TEMPORARY_REDIRECT = 307; + const STATUS_BAD_REQUEST = 400; + const STATUS_UNAUTHORIZED = 401; + const STATUS_PAYMENT_REQUIRED = 402; + const STATUS_FORBIDDEN = 403; + const STATUS_NOT_FOUND = 404; + const STATUS_METHOD_NOT_ALLOWED = 405; + const STATUS_NOT_ACCEPTABLE = 406; + const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407; + const STATUS_REQUEST_TIMEOUT = 408; + const STATUS_CONFLICT = 409; + const STATUS_GONE = 410; + const STATUS_LENGTH_REQUIRED = 411; + const STATUS_PRECONDITION_FAILED = 412; + const STATUS_REQUEST_ENTITY_TOO_LARGE = 413; + const STATUS_REQUEST_URI_TOO_LONG = 414; + const STATUS_UNSUPPORTED_MEDIA_TYPE = 415; + const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416; + const STATUS_EXPECTATION_FAILED = 417; + const STATUS_IM_A_TEAPOT = 418; + const STATUS_UNPROCESSABLE_ENTITY = 422; + const STATUS_LOCKED = 423; + const STATUS_FAILED_DEPENDENCY = 424; + const STATUS_UPGRADE_REQUIRED = 426; + const STATUS_PRECONDITION_REQUIRED = 428; + const STATUS_TOO_MANY_REQUESTS = 429; + const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; + const STATUS_INTERNAL_SERVER_ERROR = 500; + const STATUS_NOT_IMPLEMENTED = 501; + const STATUS_BAD_GATEWAY = 502; + const STATUS_SERVICE_UNAVAILABLE = 503; + const STATUS_GATEWAY_TIMEOUT = 504; + const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505; + const STATUS_VARIANT_ALSO_NEGOTIATES = 506; + const STATUS_INSUFFICIENT_STORAGE = 507; + const STATUS_LOOP_DETECTED = 508; + const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509; + const STATUS_NOT_EXTENDED = 510; + const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511; + + private $server; + private $protocolVersion; + protected $headers; + + /** + * @param $_SERVER $server + * @param string $protocolVersion the http version to use defaults to HTTP/1.1 + */ + public function __construct($server, $protocolVersion='HTTP/1.1') { + $this->server = $server; + $this->protocolVersion = $protocolVersion; + + $this->headers = array( + self::STATUS_CONTINUE => 'Continue', + self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols', + self::STATUS_PROCESSING => 'Processing', + self::STATUS_OK => 'OK', + self::STATUS_CREATED => 'Created', + self::STATUS_ACCEPTED => 'Accepted', + self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information', + self::STATUS_NO_CONTENT => 'No Content', + self::STATUS_RESET_CONTENT => 'Reset Content', + self::STATUS_PARTIAL_CONTENT => 'Partial Content', + self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918 + self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842 + self::STATUS_IM_USED => 'IM Used', // RFC 3229 + self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices', + self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently', + self::STATUS_FOUND => 'Found', + self::STATUS_SEE_OTHER => 'See Other', + self::STATUS_NOT_MODIFIED => 'Not Modified', + self::STATUS_USE_PROXY => 'Use Proxy', + self::STATUS_RESERVED => 'Reserved', + self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect', + self::STATUS_BAD_REQUEST => 'Bad request', + self::STATUS_UNAUTHORIZED => 'Unauthorized', + self::STATUS_PAYMENT_REQUIRED => 'Payment Required', + self::STATUS_FORBIDDEN => 'Forbidden', + self::STATUS_NOT_FOUND => 'Not Found', + self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed', + self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable', + self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required', + self::STATUS_REQUEST_TIMEOUT => 'Request Timeout', + self::STATUS_CONFLICT => 'Conflict', + self::STATUS_GONE => 'Gone', + self::STATUS_LENGTH_REQUIRED => 'Length Required', + self::STATUS_PRECONDITION_FAILED => 'Precondition failed', + self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large', + self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long', + self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type', + self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable', + self::STATUS_EXPECTATION_FAILED => 'Expectation Failed', + self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324 + self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918 + self::STATUS_LOCKED => 'Locked', // RFC 4918 + self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918 + self::STATUS_UPGRADE_REQUIRED => 'Upgrade required', + self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status + self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status + self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status + self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error', + self::STATUS_NOT_IMPLEMENTED => 'Not Implemented', + self::STATUS_BAD_GATEWAY => 'Bad Gateway', + self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable', + self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout', + self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported', + self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates', + self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918 + self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842 + self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard + self::STATUS_NOT_EXTENDED => 'Not extended', + self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status + ); + } + + + /** + * Gets the correct header + * @param Http::CONSTANT $status the constant from the Http class + * @param \DateTime $lastModified formatted last modified date + * @param string $Etag the etag + */ + public function getStatusHeader($status, \DateTime $lastModified=null, + $ETag=null) { + + if(!is_null($lastModified)) { + $lastModified = $lastModified->format(\DateTime::RFC2822); + } + + // if etag or lastmodified have not changed, return a not modified + if ((isset($this->server['HTTP_IF_NONE_MATCH']) + && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) + + || + + (isset($this->server['HTTP_IF_MODIFIED_SINCE']) + && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === + $lastModified)) { + + $status = self::STATUS_NOT_MODIFIED; + } + + // we have one change currently for the http 1.0 header that differs + // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND + // if this differs any more, we want to create childclasses for this + if($status === self::STATUS_TEMPORARY_REDIRECT + && $this->protocolVersion === 'HTTP/1.0') { + + $status = self::STATUS_FOUND; + } + + return $this->protocolVersion . ' ' . $status . ' ' . + $this->headers[$status]; + } + + +} + + diff --git a/lib/appframework/http/jsonresponse.php b/lib/appframework/http/jsonresponse.php new file mode 100644 index 00000000000..750f8a2ad15 --- /dev/null +++ b/lib/appframework/http/jsonresponse.php @@ -0,0 +1,74 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +/** + * A renderer for JSON calls + */ +class JSONResponse extends Response { + + protected $data; + + + /** + * @param array|object $data the object or array that should be transformed + * @param int $statusCode the Http status code, defaults to 200 + */ + public function __construct($data=array(), $statusCode=Http::STATUS_OK) { + $this->data = $data; + $this->setStatus($statusCode); + $this->addHeader('X-Content-Type-Options', 'nosniff'); + $this->addHeader('Content-type', 'application/json; charset=utf-8'); + } + + + /** + * Returns the rendered json + * @return string the rendered json + */ + public function render(){ + return json_encode($this->data); + } + + /** + * Sets values in the data json array + * @param array|object $params an array or object which will be transformed + * to JSON + */ + public function setData($data){ + $this->data = $data; + } + + + /** + * Used to get the set parameters + * @return array the data + */ + public function getData(){ + return $this->data; + } + +} diff --git a/lib/appframework/http/redirectresponse.php b/lib/appframework/http/redirectresponse.php new file mode 100644 index 00000000000..727e0fb642e --- /dev/null +++ b/lib/appframework/http/redirectresponse.php @@ -0,0 +1,54 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +/** + * Redirects to a different URL + */ +class RedirectResponse extends Response { + + private $redirectURL; + + /** + * Creates a response that redirects to a url + * @param string $redirectURL the url to redirect to + */ + public function __construct($redirectURL) { + $this->redirectURL = $redirectURL; + $this->setStatus(Http::STATUS_TEMPORARY_REDIRECT); + $this->addHeader('Location', $redirectURL); + } + + + /** + * @return string the url to redirect + */ + public function getRedirectURL() { + return $this->redirectURL; + } + + +} diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php new file mode 100644 index 00000000000..7d024c8605f --- /dev/null +++ b/lib/appframework/http/request.php @@ -0,0 +1,217 @@ +. + * + */ + +namespace OC\AppFramework\Http; + +/** + * Class for accessing variables in the request. + * This class provides an immutable object with request variables. + */ + +class Request implements \ArrayAccess, \Countable { + + protected $items = array(); + protected $allowedKeys = array( + 'get', + 'post', + 'files', + 'server', + 'env', + 'session', + 'cookies', + 'urlParams', + 'params', + 'parameters', + 'method' + ); + + /** + * @param array $vars An associative array with the following optional values: + * @param array 'params' the parsed json array + * @param array 'urlParams' the parameters which were matched from the URL + * @param array 'get' the $_GET array + * @param array 'post' the $_POST array + * @param array 'files' the $_FILES array + * @param array 'server' the $_SERVER array + * @param array 'env' the $_ENV array + * @param array 'session' the $_SESSION array + * @param array 'cookies' the $_COOKIE array + * @param string 'method' the request method (GET, POST etc) + * @see http://www.php.net/manual/en/reserved.variables.php + */ + public function __construct(array $vars=array()) { + + foreach($this->allowedKeys as $name) { + $this->items[$name] = isset($vars[$name]) + ? $vars[$name] + : array(); + } + + $this->items['parameters'] = array_merge( + $this->items['params'], + $this->items['get'], + $this->items['post'], + $this->items['urlParams'] + ); + + } + + // Countable method. + public function count() { + return count(array_keys($this->items['parameters'])); + } + + /** + * ArrayAccess methods + * + * Gives access to the combined GET, POST and urlParams arrays + * + * Examples: + * + * $var = $request['myvar']; + * + * or + * + * if(!isset($request['myvar']) { + * // Do something + * } + * + * $request['myvar'] = 'something'; // This throws an exception. + * + * @param string $offset The key to lookup + * @return string|null + */ + public function offsetExists($offset) { + return isset($this->items['parameters'][$offset]); + } + + /** + * @see offsetExists + */ + public function offsetGet($offset) { + return isset($this->items['parameters'][$offset]) + ? $this->items['parameters'][$offset] + : null; + } + + /** + * @see offsetExists + */ + public function offsetSet($offset, $value) { + throw new \RuntimeException('You cannot change the contents of the request object'); + } + + /** + * @see offsetExists + */ + public function offsetUnset($offset) { + throw new \RuntimeException('You cannot change the contents of the request object'); + } + + // Magic property accessors + public function __set($name, $value) { + throw new \RuntimeException('You cannot change the contents of the request object'); + } + + /** + * Access request variables by method and name. + * Examples: + * + * $request->post['myvar']; // Only look for POST variables + * $request->myvar; or $request->{'myvar'}; or $request->{$myvar} + * Looks in the combined GET, POST and urlParams array. + * + * if($request->method !== 'POST') { + * throw new Exception('This function can only be invoked using POST'); + * } + * + * @param string $name The key to look for. + * @return mixed|null + */ + public function __get($name) { + switch($name) { + case 'get': + case 'post': + case 'files': + case 'server': + case 'env': + case 'session': + case 'cookies': + case 'parameters': + case 'params': + case 'urlParams': + return isset($this->items[$name]) + ? $this->items[$name] + : null; + break; + case 'method': + return $this->items['method']; + break; + default; + return isset($this[$name]) + ? $this[$name] + : null; + break; + } + } + + + public function __isset($name) { + return isset($this->items['parameters'][$name]); + } + + + public function __unset($id) { + throw new \RunTimeException('You cannot change the contents of the request object'); + } + + /** + * Returns the value for a specific http header. + * + * This method returns null if the header did not exist. + * + * @param string $name + * @return string + */ + public function getHeader($name) { + + $name = strtoupper(str_replace(array('-'),array('_'),$name)); + if (isset($this->server['HTTP_' . $name])) { + return $this->server['HTTP_' . $name]; + } + + // There's a few headers that seem to end up in the top-level + // server array. + switch($name) { + case 'CONTENT_TYPE' : + case 'CONTENT_LENGTH' : + if (isset($this->server[$name])) { + return $this->server[$name]; + } + break; + + } + + return null; + } + +} diff --git a/lib/appframework/http/response.php b/lib/appframework/http/response.php new file mode 100644 index 00000000000..50778105f24 --- /dev/null +++ b/lib/appframework/http/response.php @@ -0,0 +1,169 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +/** + * Base class for responses. Also used to just send headers + */ +class Response { + + /** + * @var array default headers + */ + private $headers = array( + 'Cache-Control' => 'no-cache, must-revalidate' + ); + + + /** + * @var string + */ + private $status = Http::STATUS_OK; + + + /** + * @var \DateTime + */ + private $lastModified; + + + /** + * @var string + */ + private $ETag; + + + /** + * Caches the response + * @param int $cacheSeconds the amount of seconds that should be cached + * if 0 then caching will be disabled + */ + public function cacheFor($cacheSeconds) { + + if($cacheSeconds > 0) { + $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . + ', must-revalidate'); + } else { + $this->addHeader('Cache-Control', 'no-cache, must-revalidate'); + } + + } + + + /** + * Adds a new header to the response that will be called before the render + * function + * @param string $name The name of the HTTP header + * @param string $value The value, null will delete it + */ + public function addHeader($name, $value) { + if(is_null($value)) { + unset($this->headers[$name]); + } else { + $this->headers[$name] = $value; + } + } + + + /** + * Returns the set headers + * @return array the headers + */ + public function getHeaders() { + $mergeWith = array(); + + if($this->lastModified) { + $mergeWith['Last-Modified'] = + $this->lastModified->format(\DateTime::RFC2822); + } + + if($this->ETag) { + $mergeWith['ETag'] = '"' . $this->ETag . '"'; + } + + return array_merge($mergeWith, $this->headers); + } + + + /** + * By default renders no output + * @return null + */ + public function render() { + return null; + } + + + /** + * Set response status + * @param int $status a HTTP status code, see also the STATUS constants + */ + public function setStatus($status) { + $this->status = $status; + } + + + /** + * Get response status + */ + public function getStatus() { + return $this->status; + } + + + /** + * @return string the etag + */ + public function getETag() { + return $this->ETag; + } + + + /** + * @return string RFC2822 formatted last modified date + */ + public function getLastModified() { + return $this->lastModified; + } + + + /** + * @param string $ETag + */ + public function setETag($ETag) { + $this->ETag = $ETag; + } + + + /** + * @param \DateTime $lastModified + */ + public function setLastModified($lastModified) { + $this->lastModified = $lastModified; + } + + +} diff --git a/lib/appframework/http/templateresponse.php b/lib/appframework/http/templateresponse.php new file mode 100644 index 00000000000..0a32da4b1b4 --- /dev/null +++ b/lib/appframework/http/templateresponse.php @@ -0,0 +1,126 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + +use OC\AppFramework\Core\API; + + +/** + * Response for a normal template + */ +class TemplateResponse extends Response { + + protected $templateName; + protected $params; + protected $api; + protected $renderAs; + protected $appName; + + /** + * @param API $api an API instance + * @param string $templateName the name of the template + * @param string $appName optional if you want to include a template from + * a different app + */ + public function __construct(API $api, $templateName, $appName=null) { + $this->templateName = $templateName; + $this->appName = $appName; + $this->api = $api; + $this->params = array(); + $this->renderAs = 'user'; + } + + + /** + * Sets template parameters + * @param array $params an array with key => value structure which sets template + * variables + */ + public function setParams(array $params){ + $this->params = $params; + } + + + /** + * Used for accessing the set parameters + * @return array the params + */ + public function getParams(){ + return $this->params; + } + + + /** + * Used for accessing the name of the set template + * @return string the name of the used template + */ + public function getTemplateName(){ + return $this->templateName; + } + + + /** + * Sets the template page + * @param string $renderAs admin, user or blank. Admin also prints the admin + * settings header and footer, user renders the normal + * normal page including footer and header and blank + * just renders the plain template + */ + public function renderAs($renderAs){ + $this->renderAs = $renderAs; + } + + + /** + * Returns the set renderAs + * @return string the renderAs value + */ + public function getRenderAs(){ + return $this->renderAs; + } + + + /** + * Returns the rendered html + * @return string the rendered html + */ + public function render(){ + + if($this->appName !== null){ + $appName = $this->appName; + } else { + $appName = $this->api->getAppName(); + } + + $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName); + + foreach($this->params as $key => $value){ + $template->assign($key, $value); + } + + return $template->fetchPage(); + } + +} diff --git a/lib/appframework/middleware/middleware.php b/lib/appframework/middleware/middleware.php new file mode 100644 index 00000000000..4df88490468 --- /dev/null +++ b/lib/appframework/middleware/middleware.php @@ -0,0 +1,100 @@ +. + * + */ + + +namespace OC\AppFramework\Middleware; + +use OC\AppFramework\Http\Response; + + +/** + * Middleware is used to provide hooks before or after controller methods and + * deal with possible exceptions raised in the controller methods. + * They're modeled after Django's middleware system: + * https://docs.djangoproject.com/en/dev/topics/http/middleware/ + */ +abstract class Middleware { + + + /** + * This is being run in normal order before the controller is being + * called which allows several modifications and checks + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + */ + public function beforeController($controller, $methodName){ + + } + + + /** + * This is being run when either the beforeController method or the + * controller method itself is throwing an exception. The middleware is + * asked in reverse order to handle the exception and to return a response. + * If the response is null, it is assumed that the exception could not be + * handled and the error will be thrown again + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param \Exception $exception the thrown exception + * @throws \Exception the passed in exception if it cant handle it + * @return Response a Response object in case that the exception was handled + */ + public function afterException($controller, $methodName, \Exception $exception){ + throw $exception; + } + + + /** + * This is being run after a successful controllermethod call and allows + * the manipulation of a Response object. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param Response $response the generated response from the controller + * @return Response a Response object + */ + public function afterController($controller, $methodName, Response $response){ + return $response; + } + + + /** + * This is being run after the response object has been rendered and + * allows the manipulation of the output. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param string $output the generated output from a response + * @return string the output that should be printed + */ + public function beforeOutput($controller, $methodName, $output){ + return $output; + } + +} diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/appframework/middleware/middlewaredispatcher.php new file mode 100644 index 00000000000..c2d16134dc5 --- /dev/null +++ b/lib/appframework/middleware/middlewaredispatcher.php @@ -0,0 +1,159 @@ +. + * + */ + + +namespace OC\AppFramework\Middleware; + +use OC\AppFramework\Controller\Controller; +use OC\AppFramework\Http\Response; + + +/** + * This class is used to store and run all the middleware in correct order + */ +class MiddlewareDispatcher { + + /** + * @var array array containing all the middlewares + */ + private $middlewares; + + /** + * @var int counter which tells us what middlware was executed once an + * exception occurs + */ + private $middlewareCounter; + + + /** + * Constructor + */ + public function __construct(){ + $this->middlewares = array(); + $this->middlewareCounter = 0; + } + + + /** + * Adds a new middleware + * @param Middleware $middleware the middleware which will be added + */ + public function registerMiddleware(Middleware $middleWare){ + array_push($this->middlewares, $middleWare); + } + + + /** + * returns an array with all middleware elements + * @return array the middlewares + */ + public function getMiddlewares(){ + return $this->middlewares; + } + + + /** + * This is being run in normal order before the controller is being + * called which allows several modifications and checks + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + */ + public function beforeController(Controller $controller, $methodName){ + // we need to count so that we know which middlewares we have to ask in + // case theres an exception + for($i=0; $imiddlewares); $i++){ + $this->middlewareCounter++; + $middleware = $this->middlewares[$i]; + $middleware->beforeController($controller, $methodName); + } + } + + + /** + * This is being run when either the beforeController method or the + * controller method itself is throwing an exception. The middleware is asked + * in reverse order to handle the exception and to return a response. + * If the response is null, it is assumed that the exception could not be + * handled and the error will be thrown again + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param \Exception $exception the thrown exception + * @return Response a Response object if the middleware can handle the + * exception + * @throws \Exception the passed in exception if it cant handle it + */ + public function afterException(Controller $controller, $methodName, \Exception $exception){ + for($i=$this->middlewareCounter-1; $i>=0; $i--){ + $middleware = $this->middlewares[$i]; + try { + return $middleware->afterException($controller, $methodName, $exception); + } catch(\Exception $exception){ + continue; + } + } + throw $exception; + } + + + /** + * This is being run after a successful controllermethod call and allows + * the manipulation of a Response object. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param Response $response the generated response from the controller + * @return Response a Response object + */ + public function afterController(Controller $controller, $methodName, Response $response){ + for($i=count($this->middlewares)-1; $i>=0; $i--){ + $middleware = $this->middlewares[$i]; + $response = $middleware->afterController($controller, $methodName, $response); + } + return $response; + } + + + /** + * This is being run after the response object has been rendered and + * allows the manipulation of the output. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param string $output the generated output from a response + * @return string the output that should be printed + */ + public function beforeOutput(Controller $controller, $methodName, $output){ + for($i=count($this->middlewares)-1; $i>=0; $i--){ + $middleware = $this->middlewares[$i]; + $output = $middleware->beforeOutput($controller, $methodName, $output); + } + return $output; + } + +} diff --git a/lib/appframework/middleware/security/securityexception.php b/lib/appframework/middleware/security/securityexception.php new file mode 100644 index 00000000000..b32a2769ff5 --- /dev/null +++ b/lib/appframework/middleware/security/securityexception.php @@ -0,0 +1,41 @@ +. + * + */ + + +namespace OC\AppFramework\Middleware\Security; + + +/** + * Thrown when the security middleware encounters a security problem + */ +class SecurityException extends \Exception { + + /** + * @param string $msg the security error message + * @param bool $ajax true if it resulted because of an ajax request + */ + public function __construct($msg, $code = 0) { + parent::__construct($msg, $code); + } + +} diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/appframework/middleware/security/securitymiddleware.php new file mode 100644 index 00000000000..7a715f309a0 --- /dev/null +++ b/lib/appframework/middleware/security/securitymiddleware.php @@ -0,0 +1,141 @@ +. + * + */ + + +namespace OC\AppFramework\Middleware\Security; + +use OC\AppFramework\Controller\Controller; +use OC\AppFramework\Http\Http; +use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\Response; +use OC\AppFramework\Http\JSONResponse; +use OC\AppFramework\Http\RedirectResponse; +use OC\AppFramework\Utility\MethodAnnotationReader; +use OC\AppFramework\Middleware\Middleware; +use OC\AppFramework\Core\API; + + +/** + * Used to do all the authentication and checking stuff for a controller method + * It reads out the annotations of a controller method and checks which if + * security things should be checked and also handles errors in case a security + * check fails + */ +class SecurityMiddleware extends Middleware { + + private $api; + + /** + * @var \OC\AppFramework\Http\Request + */ + private $request; + + /** + * @param API $api an instance of the api + */ + public function __construct(API $api, Request $request){ + $this->api = $api; + $this->request = $request; + } + + + /** + * This runs all the security checks before a method call. The + * security checks are determined by inspecting the controller method + * annotations + * @param string/Controller $controller the controllername or string + * @param string $methodName the name of the method + * @throws SecurityException when a security check fails + */ + public function beforeController($controller, $methodName){ + + // get annotations from comments + $annotationReader = new MethodAnnotationReader($controller, $methodName); + + // this will set the current navigation entry of the app, use this only + // for normal HTML requests and not for AJAX requests + $this->api->activateNavigationEntry(); + + // security checks + if(!$annotationReader->hasAnnotation('IsLoggedInExemption')) { + if(!$this->api->isLoggedIn()) { + throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED); + } + } + + if(!$annotationReader->hasAnnotation('IsAdminExemption')) { + if(!$this->api->isAdminUser($this->api->getUserId())) { + throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN); + } + } + + if(!$annotationReader->hasAnnotation('IsSubAdminExemption')) { + if(!$this->api->isSubAdminUser($this->api->getUserId())) { + throw new SecurityException('Logged in user must be a subadmin', Http::STATUS_FORBIDDEN); + } + } + + if(!$annotationReader->hasAnnotation('CSRFExemption')) { + if(!$this->api->passesCSRFCheck()) { + throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); + } + } + + } + + + /** + * If an SecurityException is being caught, ajax requests return a JSON error + * response and non ajax requests redirect to the index + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param \Exception $exception the thrown exception + * @throws \Exception the passed in exception if it cant handle it + * @return Response a Response object or null in case that the exception could not be handled + */ + public function afterException($controller, $methodName, \Exception $exception){ + if($exception instanceof SecurityException){ + + if (stripos($this->request->getHeader('Accept'),'html')===false) { + + $response = new JSONResponse( + array('message' => $exception->getMessage()), + $exception->getCode() + ); + $this->api->log($exception->getMessage(), 'debug'); + } else { + + $url = $this->api->linkToAbsolute('index.php', ''); // TODO: replace with link to route + $response = new RedirectResponse($url); + $this->api->log($exception->getMessage(), 'debug'); + } + + return $response; + + } + + throw $exception; + } + +} diff --git a/lib/appframework/routing/routeactionhandler.php b/lib/appframework/routing/routeactionhandler.php new file mode 100644 index 00000000000..7fb56f14eab --- /dev/null +++ b/lib/appframework/routing/routeactionhandler.php @@ -0,0 +1,42 @@ +. + * + */ + +namespace OC\AppFramework\routing; + +use \OC\AppFramework\App; +use \OC\AppFramework\DependencyInjection\DIContainer; + +class RouteActionHandler { + private $controllerName; + private $actionName; + private $container; + + public function __construct(DIContainer $container, $controllerName, $actionName) { + $this->controllerName = $controllerName; + $this->actionName = $actionName; + $this->container = $container; + } + + public function __invoke($params) { + App::main($this->controllerName, $this->actionName, $params, $this->container); + } +} diff --git a/lib/appframework/routing/routeconfig.php b/lib/appframework/routing/routeconfig.php new file mode 100644 index 00000000000..53ab11bf2f5 --- /dev/null +++ b/lib/appframework/routing/routeconfig.php @@ -0,0 +1,186 @@ +. + * + */ + +namespace OC\AppFramework\routing; + +use OC\AppFramework\DependencyInjection\DIContainer; + +/** + * Class RouteConfig + * @package OC\AppFramework\routing + */ +class RouteConfig { + private $container; + private $router; + private $routes; + private $appName; + + /** + * @param \OC\AppFramework\DependencyInjection\DIContainer $container + * @param \OC_Router $router + * @param string $pathToYml + * @internal param $appName + */ + public function __construct(DIContainer $container, \OC_Router $router, $routes) { + $this->routes = $routes; + $this->container = $container; + $this->router = $router; + $this->appName = $container['AppName']; + } + + /** + * The routes and resource will be registered to the \OC_Router + */ + public function register() { + + // parse simple + $this->processSimpleRoutes($this->routes); + + // parse resources + $this->processResources($this->routes); + } + + /** + * Creates one route base on the give configuration + * @param $routes + * @throws \UnexpectedValueException + */ + private function processSimpleRoutes($routes) + { + $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array(); + foreach ($simpleRoutes as $simpleRoute) { + $name = $simpleRoute['name']; + $url = $simpleRoute['url']; + $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET'; + + $split = explode('#', $name, 2); + if (count($split) != 2) { + throw new \UnexpectedValueException('Invalid route name'); + } + $controller = $split[0]; + $action = $split[1]; + + $controllerName = $this->buildControllerName($controller); + $actionName = $this->buildActionName($action); + + // register the route + $handler = new RouteActionHandler($this->container, $controllerName, $actionName); + $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)->method($verb)->action($handler); + } + } + + /** + * For a given name and url restful routes are created: + * - index + * - show + * - new + * - create + * - update + * - destroy + * + * @param $routes + */ + private function processResources($routes) + { + // declaration of all restful actions + $actions = array( + array('name' => 'index', 'verb' => 'GET', 'on-collection' => true), + array('name' => 'show', 'verb' => 'GET'), + array('name' => 'create', 'verb' => 'POST', 'on-collection' => true), + array('name' => 'update', 'verb' => 'PUT'), + array('name' => 'destroy', 'verb' => 'DELETE'), + ); + + $resources = isset($routes['resources']) ? $routes['resources'] : array(); + foreach ($resources as $resource => $config) { + + // the url parameter used as id to the resource + $resourceId = $this->buildResourceId($resource); + foreach($actions as $action) { + $url = $config['url']; + $method = $action['name']; + $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET'; + $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false; + if (!$collectionAction) { + $url = $url . '/' . $resourceId; + } + if (isset($action['url-postfix'])) { + $url = $url . '/' . $action['url-postfix']; + } + + $controller = $resource; + + $controllerName = $this->buildControllerName($controller); + $actionName = $this->buildActionName($method); + + $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method); + + $this->router->create($routeName, $url)->method($verb)->action( + new RouteActionHandler($this->container, $controllerName, $actionName) + ); + } + } + } + + /** + * Based on a given route name the controller name is generated + * @param $controller + * @return string + */ + private function buildControllerName($controller) + { + return $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller'; + } + + /** + * Based on the action part of the route name the controller method name is generated + * @param $action + * @return string + */ + private function buildActionName($action) { + return $this->underScoreToCamelCase($action); + } + + /** + * Generates the id used in the url part o the route url + * @param $resource + * @return string + */ + private function buildResourceId($resource) { + return '{'.$this->underScoreToCamelCase(rtrim($resource, 's')).'Id}'; + } + + /** + * Underscored strings are converted to camel case strings + * @param $str string + * @return string + */ + private function underScoreToCamelCase($str) { + $pattern = "/_[a-z]?/"; + return preg_replace_callback( + $pattern, + function ($matches) { + return strtoupper(ltrim($matches[0], "_")); + }, + $str); + } +} diff --git a/lib/appframework/utility/methodannotationreader.php b/lib/appframework/utility/methodannotationreader.php new file mode 100644 index 00000000000..42060a08529 --- /dev/null +++ b/lib/appframework/utility/methodannotationreader.php @@ -0,0 +1,61 @@ +. + * + */ + + +namespace OC\AppFramework\Utility; + + +/** + * Reads and parses annotations from doc comments + */ +class MethodAnnotationReader { + + private $annotations; + + /** + * @param object $object an object or classname + * @param string $method the method which we want to inspect for annotations + */ + public function __construct($object, $method){ + $this->annotations = array(); + + $reflection = new \ReflectionMethod($object, $method); + $docs = $reflection->getDocComment(); + + // extract everything prefixed by @ and first letter uppercase + preg_match_all('/@([A-Z]\w+)/', $docs, $matches); + $this->annotations = $matches[1]; + } + + + /** + * Check if a method contains an annotation + * @param string $name the name of the annotation + * @return bool true if the annotation is found + */ + public function hasAnnotation($name){ + return in_array($name, $this->annotations); + } + + +} diff --git a/lib/appframework/utility/timefactory.php b/lib/appframework/utility/timefactory.php new file mode 100644 index 00000000000..2c3dd6cf5e3 --- /dev/null +++ b/lib/appframework/utility/timefactory.php @@ -0,0 +1,42 @@ +. + * + */ + + +namespace OC\AppFramework\Utility; + + +/** + * Needed to mock calls to time() + */ +class TimeFactory { + + + /** + * @return int the result of a call to time() + */ + public function getTime() { + return time(); + } + + +} diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php new file mode 100644 index 00000000000..000094d07c8 --- /dev/null +++ b/tests/lib/appframework/AppTest.php @@ -0,0 +1,107 @@ +. + * + */ + + +namespace OC\AppFramework; + +use OC\AppFramework\Http\Request; +use OC\AppFramework\Core\API; +use OC\AppFramework\Middleware\MiddlewareDispatcher; + +// FIXME: loading pimpl correctly from 3rdparty repo +require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; +require_once __DIR__ . "/classloader.php"; + + +class AppTest extends \PHPUnit_Framework_TestCase { + + private $container; + private $api; + private $controller; + private $dispatcher; + private $params; + private $headers; + private $output; + private $controllerName; + private $controllerMethod; + + protected function setUp() { + $this->container = new \Pimple(); + $this->controller = $this->getMockBuilder( + 'OC\AppFramework\Controller\Controller') + ->disableOriginalConstructor() + ->getMock(); + $this->dispatcher = $this->getMockBuilder( + 'OC\AppFramework\Http\Dispatcher') + ->disableOriginalConstructor() + ->getMock(); + + + $this->headers = array('key' => 'value'); + $this->output = 'hi'; + $this->controllerName = 'Controller'; + $this->controllerMethod = 'method'; + + $this->container[$this->controllerName] = $this->controller; + $this->container['Dispatcher'] = $this->dispatcher; + } + + + public function testControllerNameAndMethodAreBeingPassed(){ + $return = array(null, array(), null); + $this->dispatcher->expects($this->once()) + ->method('dispatch') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod)) + ->will($this->returnValue($return)); + + $this->expectOutputString(''); + + App::main($this->controllerName, $this->controllerMethod, array(), + $this->container); + } + + + /* + FIXME: this complains about shit headers which are already sent because + of the content length. Would be cool if someone could fix this + + public function testOutputIsPrinted(){ + $return = array(null, array(), $this->output); + $this->dispatcher->expects($this->once()) + ->method('dispatch') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod)) + ->will($this->returnValue($return)); + + $this->expectOutputString($this->output); + + App::main($this->controllerName, $this->controllerMethod, array(), + $this->container); + } + */ + + // FIXME: if someone manages to test the headers output, I'd be grateful + + +} diff --git a/tests/lib/appframework/classloader.php b/tests/lib/appframework/classloader.php new file mode 100644 index 00000000000..ae485e67b2c --- /dev/null +++ b/tests/lib/appframework/classloader.php @@ -0,0 +1,45 @@ +. + * + */ + +// to execute without ownCloud, we need to create our own class loader +spl_autoload_register(function ($className){ + if (strpos($className, 'OC\\AppFramework') === 0) { + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $relPath = __DIR__ . '/../../../lib/' . $path; + + if(file_exists($relPath)){ + require_once $relPath; + } + } + + // FIXME: this will most probably not work anymore + if (strpos($className, 'OCA\\') === 0) { + + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $relPath = __DIR__ . '/../..' . $path; + + if(file_exists($relPath)){ + require_once $relPath; + } + } +}); diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php new file mode 100644 index 00000000000..d8357c2a685 --- /dev/null +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -0,0 +1,161 @@ +. + * + */ + + +namespace Test\AppFramework\Controller; + +use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\JSONResponse; +use OC\AppFramework\Http\TemplateResponse; +use OC\AppFramework\Controller\Controller; + + +require_once(__DIR__ . "/../classloader.php"); + + +class ChildController extends Controller {}; + +class ControllerTest extends \PHPUnit_Framework_TestCase { + + /** + * @var Controller + */ + private $controller; + private $api; + + protected function setUp(){ + $request = new Request( + array( + 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'), + 'urlParams' => array('name' => 'Johnny Weissmüller'), + 'files' => array('file' => 'filevalue'), + 'env' => array('PATH' => 'daheim'), + 'session' => array('sezession' => 'kein'), + 'method' => 'hi', + ) + ); + + $this->api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName'), array('test')); + $this->api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('apptemplate_advanced')); + + $this->controller = new ChildController($this->api, $request); + } + + + public function testParamsGet(){ + $this->assertEquals('Johnny Weissmüller', $this->controller->params('name', 'Tarzan')); + } + + + public function testParamsGetDefault(){ + $this->assertEquals('Tarzan', $this->controller->params('Ape Man', 'Tarzan')); + } + + + public function testParamsFile(){ + $this->assertEquals('filevalue', $this->controller->params('file', 'filevalue')); + } + + + public function testGetUploadedFile(){ + $this->assertEquals('filevalue', $this->controller->getUploadedFile('file')); + } + + + + public function testGetUploadedFileDefault(){ + $this->assertEquals('default', $this->controller->params('files', 'default')); + } + + + public function testGetParams(){ + $params = array( + 'name' => 'Johnny Weissmüller', + 'nickname' => 'Janey', + ); + + $this->assertEquals($params, $this->controller->getParams()); + } + + + public function testRender(){ + $this->assertTrue($this->controller->render('') instanceof TemplateResponse); + } + + + public function testSetParams(){ + $params = array('john' => 'foo'); + $response = $this->controller->render('home', $params); + + $this->assertEquals($params, $response->getParams()); + } + + + public function testRenderRenderAs(){ + $ocTpl = $this->getMock('Template', array('fetchPage')); + $ocTpl->expects($this->once()) + ->method('fetchPage'); + + $api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName', 'getTemplate'), array('app')); + $api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + $api->expects($this->once()) + ->method('getTemplate') + ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app')) + ->will($this->returnValue($ocTpl)); + + $this->controller = new ChildController($api, new Request()); + $this->controller->render('home', array(), 'admin')->render(); + } + + + public function testRenderHeaders(){ + $headers = array('one', 'two'); + $response = $this->controller->render('', array(), '', $headers); + + $this->assertTrue(in_array($headers[0], $response->getHeaders())); + $this->assertTrue(in_array($headers[1], $response->getHeaders())); + } + + + public function testGetRequestMethod(){ + $this->assertEquals('hi', $this->controller->method()); + } + + + public function testGetEnvVariable(){ + $this->assertEquals('daheim', $this->controller->env('PATH')); + } + + public function testGetSessionVariable(){ + $this->assertEquals('kein', $this->controller->session('sezession')); + } + + +} diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php new file mode 100644 index 00000000000..ce346f0a763 --- /dev/null +++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php @@ -0,0 +1,98 @@ +. + * + */ + + +namespace OC\AppFramework\DependencyInjection; + +use \OC\AppFramework\Http\Request; + + +require_once(__DIR__ . "/../classloader.php"); + + +class DIContainerTest extends \PHPUnit_Framework_TestCase { + + private $container; + + protected function setUp(){ + $this->container = new DIContainer('name'); + $this->api = $this->getMock('OC\AppFramework\Core\API', array('getTrans'), array('hi')); + } + + private function exchangeAPI(){ + $this->api->expects($this->any()) + ->method('getTrans') + ->will($this->returnValue('yo')); + $this->container['API'] = $this->api; + } + + public function testProvidesAPI(){ + $this->assertTrue(isset($this->container['API'])); + } + + + public function testProvidesRequest(){ + $this->assertTrue(isset($this->container['Request'])); + } + + + public function testProvidesSecurityMiddleware(){ + $this->assertTrue(isset($this->container['SecurityMiddleware'])); + } + + + public function testProvidesMiddlewareDispatcher(){ + $this->assertTrue(isset($this->container['MiddlewareDispatcher'])); + } + + + public function testProvidesAppName(){ + $this->assertTrue(isset($this->container['AppName'])); + } + + + public function testAppNameIsSetCorrectly(){ + $this->assertEquals('name', $this->container['AppName']); + } + + + public function testMiddlewareDispatcherIncludesSecurityMiddleware(){ + $this->container['Request'] = new Request(); + $security = $this->container['SecurityMiddleware']; + $dispatcher = $this->container['MiddlewareDispatcher']; + + $this->assertContains($security, $dispatcher->getMiddlewares()); + } + + + public function testMiddlewareDispatcherDoesNotIncludeTwigWhenTplDirectoryNotSet(){ + $this->container['Request'] = new Request(); + $this->exchangeAPI(); + $dispatcher = $this->container['MiddlewareDispatcher']; + + $this->assertEquals(1, count($dispatcher->getMiddlewares())); + } + +} diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php new file mode 100644 index 00000000000..2e3db110504 --- /dev/null +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -0,0 +1,218 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + +use OC\AppFramework\Core\API; +use OC\AppFramework\Middleware\MiddlewareDispatcher; + +require_once(__DIR__ . "/../classloader.php"); + + +class DispatcherTest extends \PHPUnit_Framework_TestCase { + + + private $middlewareDispatcher; + private $dispatcher; + private $controllerMethod; + private $response; + private $lastModified; + private $etag; + private $http; + + protected function setUp() { + $this->controllerMethod = 'test'; + + $api = $this->getMockBuilder( + '\OC\AppFramework\Core\API') + ->disableOriginalConstructor() + ->getMock(); + $request = $this->getMockBuilder( + '\OC\AppFramework\Http\Request') + ->disableOriginalConstructor() + ->getMock(); + $this->http = $this->getMockBuilder( + '\OC\AppFramework\Http\Http') + ->disableOriginalConstructor() + ->getMock(); + + $this->middlewareDispatcher = $this->getMockBuilder( + '\OC\AppFramework\Middleware\MiddlewareDispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->controller = $this->getMock( + '\OC\AppFramework\Controller\Controller', + array($this->controllerMethod), array($api, $request)); + + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher); + + $this->response = $this->getMockBuilder( + '\OC\AppFramework\Http\Response') + ->disableOriginalConstructor() + ->getMock(); + + $this->lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $this->etag = 'hi'; + } + + + private function setMiddlewareExpections($out=null, + $httpHeaders=null, $responseHeaders=array(), + $ex=false, $catchEx=true) { + + if($ex) { + $exception = new \Exception(); + $this->middlewareDispatcher->expects($this->once()) + ->method('beforeController') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod)) + ->will($this->throwException($exception)); + if($catchEx) { + $this->middlewareDispatcher->expects($this->once()) + ->method('afterException') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod), + $this->equalTo($exception)) + ->will($this->returnValue($this->response)); + } else { + $this->middlewareDispatcher->expects($this->once()) + ->method('afterException') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod), + $this->equalTo($exception)) + ->will($this->returnValue(null)); + return; + } + } else { + $this->middlewareDispatcher->expects($this->once()) + ->method('beforeController') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod)); + $this->controller->expects($this->once()) + ->method($this->controllerMethod) + ->will($this->returnValue($this->response)); + } + + $this->response->expects($this->once()) + ->method('render') + ->will($this->returnValue($out)); + $this->response->expects($this->once()) + ->method('getStatus') + ->will($this->returnValue(Http::STATUS_OK)); + $this->response->expects($this->once()) + ->method('getLastModified') + ->will($this->returnValue($this->lastModified)); + $this->response->expects($this->once()) + ->method('getETag') + ->will($this->returnValue($this->etag)); + $this->response->expects($this->once()) + ->method('getHeaders') + ->will($this->returnValue($responseHeaders)); + $this->http->expects($this->once()) + ->method('getStatusHeader') + ->with($this->equalTo(Http::STATUS_OK), + $this->equalTo($this->lastModified), + $this->equalTo($this->etag)) + ->will($this->returnValue($httpHeaders)); + + $this->middlewareDispatcher->expects($this->once()) + ->method('afterController') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod), + $this->equalTo($this->response)) + ->will($this->returnValue($this->response)); + + $this->middlewareDispatcher->expects($this->once()) + ->method('afterController') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod), + $this->equalTo($this->response)) + ->will($this->returnValue($this->response)); + + $this->middlewareDispatcher->expects($this->once()) + ->method('beforeOutput') + ->with($this->equalTo($this->controller), + $this->equalTo($this->controllerMethod), + $this->equalTo($out)) + ->will($this->returnValue($out)); + + + } + + + public function testDispatcherReturnsArrayWith2Entries() { + $this->setMiddlewareExpections(); + + $response = $this->dispatcher->dispatch($this->controller, + $this->controllerMethod); + $this->assertNull($response[0]); + $this->assertEquals(array(), $response[1]); + $this->assertNull($response[2]); + } + + + public function testHeadersAndOutputAreReturned(){ + $out = 'yo'; + $httpHeaders = 'Http'; + $responseHeaders = array('hell' => 'yeah'); + $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders); + + $response = $this->dispatcher->dispatch($this->controller, + $this->controllerMethod); + + $this->assertEquals($httpHeaders, $response[0]); + $this->assertEquals($responseHeaders, $response[1]); + $this->assertEquals($out, $response[2]); + } + + + public function testExceptionCallsAfterException() { + $out = 'yo'; + $httpHeaders = 'Http'; + $responseHeaders = array('hell' => 'yeah'); + $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true); + + $response = $this->dispatcher->dispatch($this->controller, + $this->controllerMethod); + + $this->assertEquals($httpHeaders, $response[0]); + $this->assertEquals($responseHeaders, $response[1]); + $this->assertEquals($out, $response[2]); + } + + + public function testExceptionThrowsIfCanNotBeHandledByAfterException() { + $out = 'yo'; + $httpHeaders = 'Http'; + $responseHeaders = array('hell' => 'yeah'); + $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false); + + $this->setExpectedException('\Exception'); + $response = $this->dispatcher->dispatch($this->controller, + $this->controllerMethod); + + } + +} diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php new file mode 100644 index 00000000000..103cfe7588c --- /dev/null +++ b/tests/lib/appframework/http/DownloadResponseTest.php @@ -0,0 +1,51 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +require_once(__DIR__ . "/../classloader.php"); + + +class ChildDownloadResponse extends DownloadResponse {}; + + +class DownloadResponseTest extends \PHPUnit_Framework_TestCase { + + protected $response; + + protected function setUp(){ + $this->response = new ChildDownloadResponse('file', 'content'); + } + + + public function testHeaders() { + $headers = $this->response->getHeaders(); + + $this->assertContains('attachment; filename="file"', $headers['Content-Disposition']); + $this->assertContains('content', $headers['Content-Type']); + } + + +} diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php new file mode 100644 index 00000000000..306bc3caf42 --- /dev/null +++ b/tests/lib/appframework/http/HttpTest.php @@ -0,0 +1,87 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +require_once(__DIR__ . "/../classloader.php"); + + + +class HttpTest extends \PHPUnit_Framework_TestCase { + + private $server; + private $http; + + protected function setUp(){ + $this->server = array(); + $this->http = new Http($this->server); + } + + + public function testProtocol() { + $header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT); + $this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header); + } + + + public function testProtocol10() { + $this->http = new Http($this->server, 'HTTP/1.0'); + $header = $this->http->getStatusHeader(Http::STATUS_OK); + $this->assertEquals('HTTP/1.0 200 OK', $header); + } + + + public function testEtagMatchReturnsNotModified() { + $http = new Http(array('HTTP_IF_NONE_MATCH' => 'hi')); + + $header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi'); + $this->assertEquals('HTTP/1.1 304 Not Modified', $header); + } + + + public function testLastModifiedMatchReturnsNotModified() { + $dateTime = new \DateTime(null, new \DateTimeZone('GMT')); + $dateTime->setTimestamp('12'); + + $http = new Http( + array( + 'HTTP_IF_MODIFIED_SINCE' => 'Thu, 01 Jan 1970 00:00:12 +0000') + ); + + $header = $http->getStatusHeader(Http::STATUS_OK, $dateTime); + $this->assertEquals('HTTP/1.1 304 Not Modified', $header); + } + + + + public function testTempRedirectBecomesFoundInHttp10() { + $http = new Http(array(), 'HTTP/1.0'); + + $header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT); + $this->assertEquals('HTTP/1.0 302 Found', $header); + } + // TODO: write unittests for http codes + +} diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php new file mode 100644 index 00000000000..d15e08f6ce1 --- /dev/null +++ b/tests/lib/appframework/http/JSONResponseTest.php @@ -0,0 +1,96 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +require_once(__DIR__ . "/../classloader.php"); + + + +class JSONResponseTest extends \PHPUnit_Framework_TestCase { + + /** + * @var JSONResponse + */ + private $json; + + protected function setUp() { + $this->json = new JSONResponse(); + } + + + public function testHeader() { + $headers = $this->json->getHeaders(); + $this->assertEquals('application/json; charset=utf-8', $headers['Content-type']); + } + + + public function testSetData() { + $params = array('hi', 'yo'); + $this->json->setData($params); + + $this->assertEquals(array('hi', 'yo'), $this->json->getData()); + } + + + public function testSetRender() { + $params = array('test' => 'hi'); + $this->json->setData($params); + + $expected = '{"test":"hi"}'; + + $this->assertEquals($expected, $this->json->render()); + } + + + public function testRender() { + $params = array('test' => 'hi'); + $this->json->setData($params); + + $expected = '{"test":"hi"}'; + + $this->assertEquals($expected, $this->json->render()); + } + + + public function testShouldHaveXContentHeaderByDefault() { + $headers = $this->json->getHeaders(); + $this->assertEquals('nosniff', $headers['X-Content-Type-Options']); + } + + + public function testConstructorAllowsToSetData() { + $data = array('hi'); + $code = 300; + $response = new JSONResponse($data, $code); + + $expected = '["hi"]'; + $this->assertEquals($expected, $response->render()); + $this->assertEquals($code, $response->getStatus()); + } + +} diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php new file mode 100644 index 00000000000..a8577feed29 --- /dev/null +++ b/tests/lib/appframework/http/RedirectResponseTest.php @@ -0,0 +1,55 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +require_once(__DIR__ . "/../classloader.php"); + + + +class RedirectResponseTest extends \PHPUnit_Framework_TestCase { + + + protected $response; + + protected function setUp(){ + $this->response = new RedirectResponse('/url'); + } + + + public function testHeaders() { + $headers = $this->response->getHeaders(); + $this->assertEquals('/url', $headers['Location']); + $this->assertEquals(Http::STATUS_TEMPORARY_REDIRECT, + $this->response->getStatus()); + } + + + public function testGetRedirectUrl(){ + $this->assertEquals('/url', $this->response->getRedirectUrl()); + } + + +} diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php new file mode 100644 index 00000000000..c1f56c01636 --- /dev/null +++ b/tests/lib/appframework/http/RequestTest.php @@ -0,0 +1,78 @@ + array('name' => 'John Q. Public', 'nickname' => 'Joey'), + ); + + $request = new Request($vars); + + // Countable + $this->assertEquals(2, count($request)); + // Array access + $this->assertEquals('Joey', $request['nickname']); + // "Magic" accessors + $this->assertEquals('Joey', $request->{'nickname'}); + $this->assertTrue(isset($request['nickname'])); + $this->assertTrue(isset($request->{'nickname'})); + $this->assertEquals(false, isset($request->{'flickname'})); + // Only testing 'get', but same approach for post, files etc. + $this->assertEquals('Joey', $request->get['nickname']); + // Always returns null if variable not set. + $this->assertEquals(null, $request->{'flickname'}); + } + + // urlParams has precedence over POST which has precedence over GET + public function testPrecedence() { + $vars = array( + 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'), + 'urlParams' => array('user' => 'jw', 'name' => 'Johnny Weissmüller'), + ); + + $request = new Request($vars); + + $this->assertEquals(3, count($request)); + $this->assertEquals('Janey', $request->{'nickname'}); + $this->assertEquals('Johnny Weissmüller', $request->{'name'}); + } + + + /** + * @expectedException RuntimeException + */ + public function testImmutableArrayAccess() { + $vars = array( + 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + ); + + $request = new Request($vars); + $request['nickname'] = 'Janey'; + } + + /** + * @expectedException RuntimeException + */ + public function testImmutableMagicAccess() { + $vars = array( + 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + ); + + $request = new Request($vars); + $request->{'nickname'} = 'Janey'; + } + +} diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php new file mode 100644 index 00000000000..621ba66545f --- /dev/null +++ b/tests/lib/appframework/http/ResponseTest.php @@ -0,0 +1,119 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + + +require_once(__DIR__ . "/../classloader.php"); + + + +class ResponseTest extends \PHPUnit_Framework_TestCase { + + + private $childResponse; + + protected function setUp(){ + $this->childResponse = new Response(); + } + + + public function testAddHeader(){ + $this->childResponse->addHeader('hello', 'world'); + $headers = $this->childResponse->getHeaders(); + $this->assertEquals('world', $headers['hello']); + } + + + public function testAddHeaderValueNullDeletesIt(){ + $this->childResponse->addHeader('hello', 'world'); + $this->childResponse->addHeader('hello', null); + $this->assertEquals(1, count($this->childResponse->getHeaders())); + } + + + public function testCacheHeadersAreDisabledByDefault(){ + $headers = $this->childResponse->getHeaders(); + $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']); + } + + + public function testRenderReturnNullByDefault(){ + $this->assertEquals(null, $this->childResponse->render()); + } + + + public function testGetStatus() { + $default = $this->childResponse->getStatus(); + + $this->childResponse->setStatus(Http::STATUS_NOT_FOUND); + + $this->assertEquals(Http::STATUS_OK, $default); + $this->assertEquals(Http::STATUS_NOT_FOUND, $this->childResponse->getStatus()); + } + + + public function testGetEtag() { + $this->childResponse->setEtag('hi'); + $this->assertEquals('hi', $this->childResponse->getEtag()); + } + + + public function testGetLastModified() { + $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $lastModified->setTimestamp(1); + $this->childResponse->setLastModified($lastModified); + $this->assertEquals($lastModified, $this->childResponse->getLastModified()); + } + + + + public function testCacheSecondsZero() { + $this->childResponse->cacheFor(0); + + $headers = $this->childResponse->getHeaders(); + $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']); + } + + + public function testCacheSeconds() { + $this->childResponse->cacheFor(33); + + $headers = $this->childResponse->getHeaders(); + $this->assertEquals('max-age=33, must-revalidate', + $headers['Cache-Control']); + } + + + + public function testEtagLastModifiedHeaders() { + $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $lastModified->setTimestamp(1); + $this->childResponse->setLastModified($lastModified); + $headers = $this->childResponse->getHeaders(); + $this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']); + } + + +} diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php new file mode 100644 index 00000000000..30684725b72 --- /dev/null +++ b/tests/lib/appframework/http/TemplateResponseTest.php @@ -0,0 +1,157 @@ +. + * + */ + + +namespace OC\AppFramework\Http; + +use OC\AppFramework\Core\API; + + +require_once(__DIR__ . "/../classloader.php"); + + +class TemplateResponseTest extends \PHPUnit_Framework_TestCase { + + private $tpl; + private $api; + + protected function setUp() { + $this->api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName'), array('test')); + $this->api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + + $this->tpl = new TemplateResponse($this->api, 'home'); + } + + + public function testSetParams(){ + $params = array('hi' => 'yo'); + $this->tpl->setParams($params); + + $this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams()); + } + + + public function testGetTemplateName(){ + $this->assertEquals('home', $this->tpl->getTemplateName()); + } + + + public function testRender(){ + $ocTpl = $this->getMock('Template', array('fetchPage')); + $ocTpl->expects($this->once()) + ->method('fetchPage'); + + $api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName', 'getTemplate'), array('app')); + $api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + $api->expects($this->once()) + ->method('getTemplate') + ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app')) + ->will($this->returnValue($ocTpl)); + + $tpl = new TemplateResponse($api, 'home'); + + $tpl->render(); + } + + + public function testRenderAssignsParams(){ + $params = array('john' => 'doe'); + + $ocTpl = $this->getMock('Template', array('assign', 'fetchPage')); + $ocTpl->expects($this->once()) + ->method('assign') + ->with($this->equalTo('john'), $this->equalTo('doe')); + + $api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName', 'getTemplate'), array('app')); + $api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + $api->expects($this->once()) + ->method('getTemplate') + ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app')) + ->will($this->returnValue($ocTpl)); + + $tpl = new TemplateResponse($api, 'home'); + $tpl->setParams($params); + + $tpl->render(); + } + + + public function testRenderDifferentApp(){ + $ocTpl = $this->getMock('Template', array('fetchPage')); + $ocTpl->expects($this->once()) + ->method('fetchPage'); + + $api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName', 'getTemplate'), array('app')); + $api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + $api->expects($this->once()) + ->method('getTemplate') + ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app2')) + ->will($this->returnValue($ocTpl)); + + $tpl = new TemplateResponse($api, 'home', 'app2'); + + $tpl->render(); + } + + + public function testRenderDifferentRenderAs(){ + $ocTpl = $this->getMock('Template', array('fetchPage')); + $ocTpl->expects($this->once()) + ->method('fetchPage'); + + $api = $this->getMock('OC\AppFramework\Core\API', + array('getAppName', 'getTemplate'), array('app')); + $api->expects($this->any()) + ->method('getAppName') + ->will($this->returnValue('app')); + $api->expects($this->once()) + ->method('getTemplate') + ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app')) + ->will($this->returnValue($ocTpl)); + + $tpl = new TemplateResponse($api, 'home'); + $tpl->renderAs('admin'); + + $tpl->render(); + } + + + public function testGetRenderAs(){ + $render = 'myrender'; + $this->tpl->renderAs($render); + $this->assertEquals($render, $this->tpl->getRenderAs()); + } + +} diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php new file mode 100644 index 00000000000..bfa54a48ea3 --- /dev/null +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -0,0 +1,280 @@ +. + * + */ + + +namespace OC\AppFramework; + +use OC\AppFramework\Controller\Controller; +use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\Response; +use OC\AppFramework\Middleware\Middleware; +use OC\AppFramework\Middleware\MiddlewareDispatcher; + + +require_once(__DIR__ . "/../classloader.php"); + + +// needed to test ordering +class TestMiddleware extends Middleware { + public static $beforeControllerCalled = 0; + public static $afterControllerCalled = 0; + public static $afterExceptionCalled = 0; + public static $beforeOutputCalled = 0; + + public $beforeControllerOrder = 0; + public $afterControllerOrder = 0; + public $afterExceptionOrder = 0; + public $beforeOutputOrder = 0; + + public $controller; + public $methodName; + public $exception; + public $response; + public $output; + + private $beforeControllerThrowsEx; + + public function __construct($beforeControllerThrowsEx) { + self::$beforeControllerCalled = 0; + self::$afterControllerCalled = 0; + self::$afterExceptionCalled = 0; + self::$beforeOutputCalled = 0; + $this->beforeControllerThrowsEx = $beforeControllerThrowsEx; + } + + public function beforeController($controller, $methodName){ + self::$beforeControllerCalled++; + $this->beforeControllerOrder = self::$beforeControllerCalled; + $this->controller = $controller; + $this->methodName = $methodName; + if($this->beforeControllerThrowsEx){ + throw new \Exception(); + } + } + + public function afterException($controller, $methodName, \Exception $exception){ + self::$afterExceptionCalled++; + $this->afterExceptionOrder = self::$afterExceptionCalled; + $this->controller = $controller; + $this->methodName = $methodName; + $this->exception = $exception; + parent::afterException($controller, $methodName, $exception); + } + + public function afterController($controller, $methodName, Response $response){ + self::$afterControllerCalled++; + $this->afterControllerOrder = self::$afterControllerCalled; + $this->controller = $controller; + $this->methodName = $methodName; + $this->response = $response; + return parent::afterController($controller, $methodName, $response); + } + + public function beforeOutput($controller, $methodName, $output){ + self::$beforeOutputCalled++; + $this->beforeOutputOrder = self::$beforeOutputCalled; + $this->controller = $controller; + $this->methodName = $methodName; + $this->output = $output; + return parent::beforeOutput($controller, $methodName, $output); + } +} + + +class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { + + private $dispatcher; + + + public function setUp() { + $this->dispatcher = new MiddlewareDispatcher(); + $this->controller = $this->getControllerMock(); + $this->method = 'method'; + $this->response = new Response(); + $this->output = 'hi'; + $this->exception = new \Exception(); + } + + + private function getAPIMock(){ + return $this->getMock('OC\AppFramework\Core\API', + array('getAppName'), array('app')); + } + + + private function getControllerMock(){ + return $this->getMock('OC\AppFramework\Controller\Controller', array('method'), + array($this->getAPIMock(), new Request())); + } + + + private function getMiddleware($beforeControllerThrowsEx=false){ + $m1 = new TestMiddleware($beforeControllerThrowsEx); + $this->dispatcher->registerMiddleware($m1); + return $m1; + } + + + public function testAfterExceptionShouldReturnResponseOfMiddleware(){ + $response = new Response(); + $m1 = $this->getMock('\OC\AppFramework\Middleware\Middleware', + array('afterException', 'beforeController')); + $m1->expects($this->never()) + ->method('afterException'); + + $m2 = $this->getMock('OC\AppFramework\Middleware\Middleware', + array('afterException', 'beforeController')); + $m2->expects($this->once()) + ->method('afterException') + ->will($this->returnValue($response)); + + $this->dispatcher->registerMiddleware($m1); + $this->dispatcher->registerMiddleware($m2); + + $this->dispatcher->beforeController($this->controller, $this->method); + $this->assertEquals($response, $this->dispatcher->afterException($this->controller, $this->method, $this->exception)); + } + + + public function testAfterExceptionShouldThrowAgainWhenNotHandled(){ + $m1 = new TestMiddleware(false); + $m2 = new TestMiddleware(true); + + $this->dispatcher->registerMiddleware($m1); + $this->dispatcher->registerMiddleware($m2); + + $this->setExpectedException('\Exception'); + $this->dispatcher->beforeController($this->controller, $this->method); + $this->dispatcher->afterException($this->controller, $this->method, $this->exception); + } + + + public function testBeforeControllerCorrectArguments(){ + $m1 = $this->getMiddleware(); + $this->dispatcher->beforeController($this->controller, $this->method); + + $this->assertEquals($this->controller, $m1->controller); + $this->assertEquals($this->method, $m1->methodName); + } + + + public function testAfterControllerCorrectArguments(){ + $m1 = $this->getMiddleware(); + + $this->dispatcher->afterController($this->controller, $this->method, $this->response); + + $this->assertEquals($this->controller, $m1->controller); + $this->assertEquals($this->method, $m1->methodName); + $this->assertEquals($this->response, $m1->response); + } + + + public function testAfterExceptionCorrectArguments(){ + $m1 = $this->getMiddleware(); + + $this->setExpectedException('\Exception'); + + $this->dispatcher->beforeController($this->controller, $this->method); + $this->dispatcher->afterException($this->controller, $this->method, $this->exception); + + $this->assertEquals($this->controller, $m1->controller); + $this->assertEquals($this->method, $m1->methodName); + $this->assertEquals($this->exception, $m1->exception); + } + + + public function testBeforeOutputCorrectArguments(){ + $m1 = $this->getMiddleware(); + + $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output); + + $this->assertEquals($this->controller, $m1->controller); + $this->assertEquals($this->method, $m1->methodName); + $this->assertEquals($this->output, $m1->output); + } + + + public function testBeforeControllerOrder(){ + $m1 = $this->getMiddleware(); + $m2 = $this->getMiddleware(); + + $this->dispatcher->beforeController($this->controller, $this->method); + + $this->assertEquals(1, $m1->beforeControllerOrder); + $this->assertEquals(2, $m2->beforeControllerOrder); + } + + public function testAfterControllerOrder(){ + $m1 = $this->getMiddleware(); + $m2 = $this->getMiddleware(); + + $this->dispatcher->afterController($this->controller, $this->method, $this->response); + + $this->assertEquals(2, $m1->afterControllerOrder); + $this->assertEquals(1, $m2->afterControllerOrder); + } + + + public function testAfterExceptionOrder(){ + $m1 = $this->getMiddleware(); + $m2 = $this->getMiddleware(); + + $this->setExpectedException('\Exception'); + $this->dispatcher->beforeController($this->controller, $this->method); + $this->dispatcher->afterException($this->controller, $this->method, $this->exception); + + $this->assertEquals(1, $m1->afterExceptionOrder); + $this->assertEquals(1, $m2->afterExceptionOrder); + } + + + public function testBeforeOutputOrder(){ + $m1 = $this->getMiddleware(); + $m2 = $this->getMiddleware(); + + $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output); + + $this->assertEquals(2, $m1->beforeOutputOrder); + $this->assertEquals(1, $m2->beforeOutputOrder); + } + + + public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(){ + $m1 = $this->getMiddleware(); + $m2 = $this->getMiddleware(true); + $m3 = $this->getMock('\OC\AppFramework\Middleware\Middleware'); + $m3->expects($this->never()) + ->method('afterException'); + $m3->expects($this->never()) + ->method('beforeController'); + $m3->expects($this->never()) + ->method('afterController'); + + $this->dispatcher->registerMiddleware($m3); + + $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output); + + $this->assertEquals(2, $m1->beforeOutputOrder); + $this->assertEquals(1, $m2->beforeOutputOrder); + } +} diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php new file mode 100644 index 00000000000..1adce6b3d4f --- /dev/null +++ b/tests/lib/appframework/middleware/MiddlewareTest.php @@ -0,0 +1,82 @@ +. + * + */ + + +namespace OC\AppFramework; + +use OC\AppFramework\Http\Request; +use OC\AppFramework\Middleware\Middleware; + + +require_once(__DIR__ . "/../classloader.php"); + + +class ChildMiddleware extends Middleware {}; + + +class MiddlewareTest extends \PHPUnit_Framework_TestCase { + + private $middleware; + private $controller; + private $exception; + private $api; + + protected function setUp(){ + $this->middleware = new ChildMiddleware(); + + $this->api = $this->getMock('OC\AppFramework\Core\API', + array(), array('test')); + + $this->controller = $this->getMock('OC\AppFramework\Controller\Controller', + array(), array($this->api, new Request())); + $this->exception = new \Exception(); + $this->response = $this->getMock('OC\AppFramework\Http\Response'); + } + + + public function testBeforeController() { + $this->middleware->beforeController($this->controller, null, $this->exception); + } + + + public function testAfterExceptionRaiseAgainWhenUnhandled() { + $this->setExpectedException('Exception'); + $afterEx = $this->middleware->afterException($this->controller, null, $this->exception); + } + + + public function testAfterControllerReturnResponseWhenUnhandled() { + $response = $this->middleware->afterController($this->controller, null, $this->response); + + $this->assertEquals($this->response, $response); + } + + + public function testBeforeOutputReturnOutputhenUnhandled() { + $output = $this->middleware->beforeOutput($this->controller, null, 'test'); + + $this->assertEquals('test', $output); + } + + +} diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php new file mode 100644 index 00000000000..0b2103564e4 --- /dev/null +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -0,0 +1,388 @@ +. + * + */ + + +namespace OC\AppFramework\Middleware\Security; + +use OC\AppFramework\Http\Http; +use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\RedirectResponse; +use OC\AppFramework\Http\JSONResponse; +use OC\AppFramework\Middleware\Middleware; + + +require_once(__DIR__ . "/../../classloader.php"); + + +class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { + + private $middleware; + private $controller; + private $secException; + private $secAjaxException; + private $request; + + public function setUp() { + $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test')); + $this->controller = $this->getMock('OC\AppFramework\Controller\Controller', + array(), array($api, new Request())); + + $this->request = new Request(); + $this->middleware = new SecurityMiddleware($api, $this->request); + $this->secException = new SecurityException('hey', false); + $this->secAjaxException = new SecurityException('hey', true); + } + + + private function getAPI(){ + return $this->getMock('OC\AppFramework\Core\API', + array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser', + 'isSubAdminUser', 'activateNavigationEntry', + 'getUserId'), + array('app')); + } + + + private function checkNavEntry($method, $shouldBeActivated=false){ + $api = $this->getAPI(); + + if($shouldBeActivated){ + $api->expects($this->once()) + ->method('activateNavigationEntry'); + } else { + $api->expects($this->never()) + ->method('activateNavigationEntry'); + } + + $sec = new SecurityMiddleware($api, $this->request); + $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testSetNavigationEntry(){ + $this->checkNavEntry('testSetNavigationEntry', true); + } + + + private function ajaxExceptionCheck($method, $shouldBeAjax=false){ + $api = $this->getAPI(); + $api->expects($this->any()) + ->method('passesCSRFCheck') + ->will($this->returnValue(false)); + + $sec = new SecurityMiddleware($api, $this->request); + + try { + $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', + $method); + } catch (SecurityException $ex){ + if($shouldBeAjax){ + $this->assertTrue($ex->isAjax()); + } else { + $this->assertFalse($ex->isAjax()); + } + + } + } + + + /** + * @Ajax + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testAjaxException(){ + $this->ajaxExceptionCheck('testAjaxException'); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testNoAjaxException(){ + $this->ajaxExceptionCheck('testNoAjaxException'); + } + + + private function ajaxExceptionStatus($method, $test, $status) { + $api = $this->getAPI(); + $api->expects($this->any()) + ->method($test) + ->will($this->returnValue(false)); + + $sec = new SecurityMiddleware($api, $this->request); + + try { + $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', + $method); + } catch (SecurityException $ex){ + $this->assertEquals($status, $ex->getCode()); + } + } + + /** + * @Ajax + */ + public function testAjaxStatusLoggedInCheck() { + $this->ajaxExceptionStatus( + 'testAjaxStatusLoggedInCheck', + 'isLoggedIn', + Http::STATUS_UNAUTHORIZED + ); + } + + /** + * @Ajax + * @IsLoggedInExemption + */ + public function testAjaxNotAdminCheck() { + $this->ajaxExceptionStatus( + 'testAjaxNotAdminCheck', + 'isAdminUser', + Http::STATUS_FORBIDDEN + ); + } + + /** + * @Ajax + * @IsLoggedInExemption + * @IsAdminExemption + */ + public function testAjaxNotSubAdminCheck() { + $this->ajaxExceptionStatus( + 'testAjaxNotSubAdminCheck', + 'isSubAdminUser', + Http::STATUS_FORBIDDEN + ); + } + + /** + * @Ajax + * @IsLoggedInExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testAjaxStatusCSRFCheck() { + $this->ajaxExceptionStatus( + 'testAjaxStatusCSRFCheck', + 'passesCSRFCheck', + Http::STATUS_PRECONDITION_FAILED + ); + } + + /** + * @Ajax + * @CSRFExemption + * @IsLoggedInExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testAjaxStatusAllGood() { + $this->ajaxExceptionStatus( + 'testAjaxStatusAllGood', + 'isLoggedIn', + 0 + ); + $this->ajaxExceptionStatus( + 'testAjaxStatusAllGood', + 'isAdminUser', + 0 + ); + $this->ajaxExceptionStatus( + 'testAjaxStatusAllGood', + 'isSubAdminUser', + 0 + ); + $this->ajaxExceptionStatus( + 'testAjaxStatusAllGood', + 'passesCSRFCheck', + 0 + ); + } + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testNoChecks(){ + $api = $this->getAPI(); + $api->expects($this->never()) + ->method('passesCSRFCheck') + ->will($this->returnValue(true)); + $api->expects($this->never()) + ->method('isAdminUser') + ->will($this->returnValue(true)); + $api->expects($this->never()) + ->method('isSubAdminUser') + ->will($this->returnValue(true)); + $api->expects($this->never()) + ->method('isLoggedIn') + ->will($this->returnValue(true)); + + $sec = new SecurityMiddleware($api, $this->request); + $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', + 'testNoChecks'); + } + + + private function securityCheck($method, $expects, $shouldFail=false){ + $api = $this->getAPI(); + $api->expects($this->once()) + ->method($expects) + ->will($this->returnValue(!$shouldFail)); + + $sec = new SecurityMiddleware($api, $this->request); + + if($shouldFail){ + $this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException'); + } + + $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); + } + + + /** + * @IsLoggedInExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testCsrfCheck(){ + $this->securityCheck('testCsrfCheck', 'passesCSRFCheck'); + } + + + /** + * @IsLoggedInExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testFailCsrfCheck(){ + $this->securityCheck('testFailCsrfCheck', 'passesCSRFCheck', true); + } + + + /** + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testLoggedInCheck(){ + $this->securityCheck('testLoggedInCheck', 'isLoggedIn'); + } + + + /** + * @CSRFExemption + * @IsAdminExemption + * @IsSubAdminExemption + */ + public function testFailLoggedInCheck(){ + $this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsSubAdminExemption + */ + public function testIsAdminCheck(){ + $this->securityCheck('testIsAdminCheck', 'isAdminUser'); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsSubAdminExemption + */ + public function testFailIsAdminCheck(){ + $this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + */ + public function testIsSubAdminCheck(){ + $this->securityCheck('testIsSubAdminCheck', 'isSubAdminUser'); + } + + + /** + * @IsLoggedInExemption + * @CSRFExemption + * @IsAdminExemption + */ + public function testFailIsSubAdminCheck(){ + $this->securityCheck('testFailIsSubAdminCheck', 'isSubAdminUser', true); + } + + + + public function testAfterExceptionNotCaughtThrowsItAgain(){ + $ex = new \Exception(); + $this->setExpectedException('\Exception'); + $this->middleware->afterException($this->controller, 'test', $ex); + } + + + public function testAfterExceptionReturnsRedirect(){ + $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test')); + $this->controller = $this->getMock('OC\AppFramework\Controller\Controller', + array(), array($api, new Request())); + + $this->request = new Request( + array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))); + $this->middleware = new SecurityMiddleware($api, $this->request); + $response = $this->middleware->afterException($this->controller, 'test', + $this->secException); + + $this->assertTrue($response instanceof RedirectResponse); + } + + + public function testAfterAjaxExceptionReturnsJSONError(){ + $response = $this->middleware->afterException($this->controller, 'test', + $this->secAjaxException); + + $this->assertTrue($response instanceof JSONResponse); + } + + +} diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php new file mode 100644 index 00000000000..92ad461471d --- /dev/null +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -0,0 +1,214 @@ + array( + array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET') + )); + + $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open'); + } + + public function testSimpleRouteWithMissingVerb() + { + $routes = array('routes' => array( + array('name' => 'folders#open', 'url' => '/folders/{folderId}/open') + )); + + $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open'); + } + + public function testSimpleRouteWithLowercaseVerb() + { + $routes = array('routes' => array( + array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete') + )); + + $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open'); + } + + /** + * @expectedException \UnexpectedValueException + */ + public function testSimpleRouteWithBrokenName() + { + $routes = array('routes' => array( + array('name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete') + )); + + // router mock + $router = $this->getMock("\OC_Router", array('create')); + + // load route configuration + $container = new DIContainer('app1'); + $config = new RouteConfig($container, $router, $routes); + + $config->register(); + } + + public function testSimpleRouteWithUnderScoreNames() + { + $routes = array('routes' => array( + array('name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete') + )); + + $this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent'); + } + + public function testResource() + { + $routes = array('resources' => array('accounts' => array('url' => '/accounts'))); + + $this->assertResource($routes, 'accounts', '/accounts', 'AccountsController', 'accountId'); + } + + public function testResourceWithUnderScoreName() + { + $routes = array('resources' => array('admin_accounts' => array('url' => '/admin/accounts'))); + + $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountId'); + } + + private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName) + { + // route mocks + $route = $this->mockRoute($verb, $controllerName, $actionName); + + // router mock + $router = $this->getMock("\OC_Router", array('create')); + + // we expect create to be called once: + $router + ->expects($this->once()) + ->method('create') + ->with($this->equalTo('app1.' . $name), $this->equalTo($url)) + ->will($this->returnValue($route)); + + // load route configuration + $container = new DIContainer('app1'); + $config = new RouteConfig($container, $router, $routes); + + $config->register(); + } + + private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName) + { + // router mock + $router = $this->getMock("\OC_Router", array('create')); + + // route mocks + $indexRoute = $this->mockRoute('GET', $controllerName, 'index'); + $showRoute = $this->mockRoute('GET', $controllerName, 'show'); + $createRoute = $this->mockRoute('POST', $controllerName, 'create'); + $updateRoute = $this->mockRoute('PUT', $controllerName, 'update'); + $destroyRoute = $this->mockRoute('DELETE', $controllerName, 'destroy'); + + $urlWithParam = $url . '/{' . $paramName . '}'; + + // we expect create to be called once: + $router + ->expects($this->at(0)) + ->method('create') + ->with($this->equalTo('app1.' . $resourceName . '.index'), $this->equalTo($url)) + ->will($this->returnValue($indexRoute)); + + $router + ->expects($this->at(1)) + ->method('create') + ->with($this->equalTo('app1.' . $resourceName . '.show'), $this->equalTo($urlWithParam)) + ->will($this->returnValue($showRoute)); + + $router + ->expects($this->at(2)) + ->method('create') + ->with($this->equalTo('app1.' . $resourceName . '.create'), $this->equalTo($url)) + ->will($this->returnValue($createRoute)); + + $router + ->expects($this->at(3)) + ->method('create') + ->with($this->equalTo('app1.' . $resourceName . '.update'), $this->equalTo($urlWithParam)) + ->will($this->returnValue($updateRoute)); + + $router + ->expects($this->at(4)) + ->method('create') + ->with($this->equalTo('app1.' . $resourceName . '.destroy'), $this->equalTo($urlWithParam)) + ->will($this->returnValue($destroyRoute)); + + // load route configuration + $container = new DIContainer('app1'); + $config = new RouteConfig($container, $router, $yaml); + + $config->register(); + } + + /** + * @param $verb + * @param $controllerName + * @param $actionName + * @return \PHPUnit_Framework_MockObject_MockObject + */ + private function mockRoute($verb, $controllerName, $actionName) + { + $container = new DIContainer('app1'); + $route = $this->getMock("\OC_Route", array('method', 'action'), array(), '', false); + $route + ->expects($this->exactly(1)) + ->method('method') + ->with($this->equalTo($verb)) + ->will($this->returnValue($route)); + + $route + ->expects($this->exactly(1)) + ->method('action') + ->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName))) + ->will($this->returnValue($route)); + return $route; + } + +} + +/* +# +# sample routes.yaml for ownCloud +# +# the section simple describes one route + +routes: + - name: folders#open + url: /folders/{folderId}/open + verb: GET + # controller: name.split()[0] + # action: name.split()[1] + +# for a resource following actions will be generated: +# - index +# - create +# - show +# - update +# - destroy +# - new +resources: + accounts: + url: /accounts + + folders: + url: /accounts/{accountId}/folders + # actions can be used to define additional actions on the resource + actions: + - name: validate + verb: GET + on-collection: false + + * */ diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php new file mode 100644 index 00000000000..bcdcf3de37b --- /dev/null +++ b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php @@ -0,0 +1,58 @@ +. + * + */ + + +namespace OC\AppFramework\Utility; + + +require_once __DIR__ . "/../classloader.php"; + + +class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase { + + + /** + * @Annotation + */ + public function testReadAnnotation(){ + $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest', + 'testReadAnnotation'); + + $this->assertTrue($reader->hasAnnotation('Annotation')); + } + + + /** + * @Annotation + * @param test + */ + public function testReadAnnotationNoLowercase(){ + $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest', + 'testReadAnnotationNoLowercase'); + + $this->assertTrue($reader->hasAnnotation('Annotation')); + $this->assertFalse($reader->hasAnnotation('param')); + } + + +} -- cgit v1.2.3 From 65d802329f8307cd010a306073d2d3ffd7dc7b74 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 18 Aug 2013 10:33:09 +0200 Subject: Fix some naming and spacing in lib/util.php --- core/setup.php | 2 +- lib/base.php | 4 ++-- lib/util.php | 25 +++++++++++++++---------- settings/admin.php | 4 ++-- 4 files changed, 20 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/core/setup.php b/core/setup.php index 1a2eac16030..4758c23b045 100644 --- a/core/setup.php +++ b/core/setup.php @@ -34,7 +34,7 @@ $opts = array( 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, 'secureRNG' => OC_Util::secureRNGAvailable(), - 'htaccessWorking' => OC_Util::isHtaccessWorking(), + 'htaccessWorking' => OC_Util::isHtAccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), ); diff --git a/lib/base.php b/lib/base.php index 7a4f5fc7ce4..32e0ebe27e9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -413,7 +413,7 @@ class OC { } self::initPaths(); - OC_Util::isSetlocaleWorking(); + OC_Util::isSetLocaleWorking(); // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { @@ -522,7 +522,7 @@ class OC { } // write error into log if locale can't be set - if (OC_Util::isSetlocaleWorking() == false) { + if (OC_Util::isSetLocaleWorking() == false) { OC_Log::write('core', 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', OC_Log::ERROR); diff --git a/lib/util.php b/lib/util.php index 24ae7d3d1c4..10b526ef6b3 100755 --- a/lib/util.php +++ b/lib/util.php @@ -18,9 +18,11 @@ class OC_Util { * @brief Can be set up * @param user string * @return boolean + * @description configure the initial filesystem based on the configuration */ - public static function setupFS( $user = '' ) { // configure the initial filesystem based on the configuration - if(self::$fsSetup) { //setting up the filesystem twice can only lead to trouble + public static function setupFS( $user = '' ) { + //setting up the filesystem twice can only lead to trouble + if(self::$fsSetup) { return false; } @@ -71,11 +73,11 @@ class OC_Util { /** * @return void - */ + */ public static function tearDownFS() { \OC\Files\Filesystem::tearDown(); self::$fsSetup=false; - self::$rootMounted=false; + self::$rootMounted=false; } /** @@ -165,9 +167,10 @@ class OC_Util { * @param int timestamp $timestamp * @param bool dateOnly option to omit time from the result * @return string timestamp + * @description adjust to clients timezone if we know it */ public static function formatDate( $timestamp, $dateOnly=false) { - if(\OC::$session->exists('timezone')) { //adjust to clients timezone if we know it + if(\OC::$session->exists('timezone')) { $systemTimeZone = intval(date('O')); $systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100); $clientTimeZone = \OC::$session->get('timezone')*60; @@ -629,13 +632,15 @@ class OC_Util { } /** - * @brief Check if the htaccess file is working by creating a test file in the data directory and trying to access via http + * @brief Check if the htaccess file is working * @return bool + * @description Check if the htaccess file is working by creating a test + * file in the data directory and trying to access via http */ - public static function isHtaccessWorking() { + public static function isHtAccessWorking() { // testdata - $filename = '/htaccesstest.txt'; - $testcontent = 'testcontent'; + $fileName = '/htaccesstest.txt'; + $testContent = 'testcontent'; // creating a test file $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename; @@ -718,7 +723,7 @@ class OC_Util { * local packages are not available on the server. * @return bool */ - public static function isSetlocaleWorking() { + public static function isSetLocaleWorking() { // setlocale test is pointless on Windows if (OC_Util::runningOnWindows() ) { return true; diff --git a/settings/admin.php b/settings/admin.php index d721593eb77..0cbb98756db 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::isHtaccessWorking(); +$htaccessworking=OC_Util::isHtAccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; @@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); -$tmpl->assign('islocaleworking', OC_Util::isSetlocaleWorking()); +$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); -- cgit v1.2.3 From 48f0c54261bfa2d2f20864b0d41db8f1df6f1777 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 19 Aug 2013 12:16:55 +0200 Subject: style fixes for preview lib --- apps/files/templates/part.list.php | 3 +- config/config.sample.php | 2 + core/ajax/preview.php | 9 +-- lib/preview.php | 76 ++++++++++---------- lib/preview/image.php | 36 ++++++++++ lib/preview/images.php | 36 ---------- lib/preview/libreoffice-cl.php | 131 ---------------------------------- lib/preview/msoffice.php | 142 ------------------------------------- lib/preview/office-cl.php | 134 ++++++++++++++++++++++++++++++++++ lib/preview/office-fallback.php | 142 +++++++++++++++++++++++++++++++++++++ lib/preview/office.php | 4 +- 11 files changed, 361 insertions(+), 354 deletions(-) create mode 100644 lib/preview/image.php delete mode 100644 lib/preview/images.php delete mode 100644 lib/preview/libreoffice-cl.php delete mode 100644 lib/preview/msoffice.php create mode 100644 lib/preview/office-cl.php create mode 100644 lib/preview/office-fallback.php (limited to 'lib') diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 1ed8e0cf91b..899fb04e252 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -3,7 +3,8 @@ $totaldirs = 0; $totalsize = 0; ?> 6 + //strlen('files/') => 6 + $relativePath = substr($file['path'], 6); $totalsize += $file['size']; if ($file['type'] === 'dir') { $totaldirs++; diff --git a/config/config.sample.php b/config/config.sample.php index 86bc20b714e..5c40078c7d7 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -199,6 +199,8 @@ $CONFIG = array( 'preview_max_scale_factor' => 10, /* custom path for libreoffice / openoffice binary */ 'preview_libreoffice_path' => '/usr/bin/libreoffice', +/* cl parameters for libreoffice / openoffice */ +'preview_office_cl_parameters' => '', // date format to be used while writing to the owncloud logfile 'logdateformat' => 'F d, Y H:i:s', ); diff --git a/core/ajax/preview.php b/core/ajax/preview.php index 486155831d7..af0f0493f4c 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -13,13 +13,15 @@ $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; if($file === '') { - \OC_Response::setStatus(400); //400 Bad Request + //400 Bad Request + \OC_Response::setStatus(400); \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); exit; } if($maxX === 0 || $maxY === 0) { - \OC_Response::setStatus(400); //400 Bad Request + //400 Bad Request + \OC_Response::setStatus(400); \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); exit; } @@ -34,6 +36,5 @@ try{ $preview->show(); }catch(\Exception $e) { \OC_Response::setStatus(500); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - exit; + \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); } \ No newline at end of file diff --git a/lib/preview.php b/lib/preview.php index e7dd327d021..9fed7f1b58f 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -13,14 +13,14 @@ */ namespace OC; -require_once('preview/images.php'); -require_once('preview/movies.php'); -require_once('preview/mp3.php'); -require_once('preview/pdf.php'); -require_once('preview/svg.php'); -require_once('preview/txt.php'); -require_once('preview/unknown.php'); -require_once('preview/office.php'); +require_once 'preview/image.php'; +require_once 'preview/movies.php'; +require_once 'preview/mp3.php'; +require_once 'preview/pdf.php'; +require_once 'preview/svg.php'; +require_once 'preview/txt.php'; +require_once 'preview/unknown.php'; +require_once 'preview/office.php'; class Preview { //the thumbnail folder @@ -32,8 +32,8 @@ class Preview { private $configMaxY; //fileview object - private $fileview = null; - private $userview = null; + private $fileView = null; + private $userView = null; //vars private $file; @@ -76,8 +76,8 @@ class Preview { if($user === ''){ $user = \OC_User::getUser(); } - $this->fileview = new \OC\Files\View('/' . $user . '/' . $root); - $this->userview = new \OC\Files\View('/' . $user); + $this->fileView = new \OC\Files\View('/' . $user . '/' . $root); + $this->userView = new \OC\Files\View('/' . $user); $this->preview = null; @@ -226,12 +226,12 @@ class Preview { public function isFileValid() { $file = $this->getFile(); if($file === '') { - \OC_Log::write('core', 'No filename passed', \OC_Log::ERROR); + \OC_Log::write('core', 'No filename passed', \OC_Log::DEBUG); return false; } - if(!$this->fileview->file_exists($file)) { - \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::ERROR); + if(!$this->fileView->file_exists($file)) { + \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::DEBUG); return false; } @@ -245,12 +245,12 @@ class Preview { public function deletePreview() { $file = $this->getFile(); - $fileInfo = $this->fileview->getFileInfo($file); + $fileInfo = $this->fileView->getFileInfo($file); $fileId = $fileInfo['fileid']; $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png'; - $this->userview->unlink($previewPath); - return !$this->userview->file_exists($previewPath); + $this->userView->unlink($previewPath); + return !$this->userView->file_exists($previewPath); } /** @@ -260,13 +260,13 @@ class Preview { public function deleteAllPreviews() { $file = $this->getFile(); - $fileInfo = $this->fileview->getFileInfo($file); + $fileInfo = $this->fileView->getFileInfo($file); $fileId = $fileInfo['fileid']; $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; - $this->userview->deleteAll($previewPath); - $this->userview->rmdir($previewPath); - return !$this->userview->is_dir($previewPath); + $this->userView->deleteAll($previewPath); + $this->userView->rmdir($previewPath); + return !$this->userView->is_dir($previewPath); } /** @@ -280,9 +280,9 @@ class Preview { $maxX = $this->getMaxX(); $maxY = $this->getMaxY(); $scalingUp = $this->getScalingUp(); - $maxscalefactor = $this->getMaxScaleFactor(); + $maxScaleFactor = $this->getMaxScaleFactor(); - $fileInfo = $this->fileview->getFileInfo($file); + $fileInfo = $this->fileView->getFileInfo($file); $fileId = $fileInfo['fileid']; if(is_null($fileId)) { @@ -290,12 +290,12 @@ class Preview { } $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; - if(!$this->userview->is_dir($previewPath)) { + if(!$this->userView->is_dir($previewPath)) { return false; } //does a preview with the wanted height and width already exist? - if($this->userview->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) { + if($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) { return $previewPath . $maxX . '-' . $maxY . '.png'; } @@ -304,7 +304,7 @@ class Preview { //array for usable cached thumbnails $possibleThumbnails = array(); - $allThumbnails = $this->userview->getDirectoryContent($previewPath); + $allThumbnails = $this->userView->getDirectoryContent($previewPath); foreach($allThumbnails as $thumbnail) { $name = rtrim($thumbnail['name'], '.png'); $size = explode('-', $name); @@ -319,7 +319,7 @@ class Preview { if($x < $maxX || $y < $maxY) { if($scalingUp) { $scalefactor = $maxX / $x; - if($scalefactor > $maxscalefactor) { + if($scalefactor > $maxScaleFactor) { continue; } }else{ @@ -371,19 +371,19 @@ class Preview { $maxY = $this->getMaxY(); $scalingUp = $this->getScalingUp(); - $fileInfo = $this->fileview->getFileInfo($file); + $fileInfo = $this->fileView->getFileInfo($file); $fileId = $fileInfo['fileid']; $cached = $this->isCached(); if($cached) { - $image = new \OC_Image($this->userview->file_get_contents($cached, 'r')); + $image = new \OC_Image($this->userView->file_get_contents($cached, 'r')); $this->preview = $image->valid() ? $image : null; $this->resizeAndCrop(); } if(is_null($this->preview)) { - $mimetype = $this->fileview->getMimeType($file); + $mimetype = $this->fileView->getMimeType($file); $preview = null; foreach(self::$providers as $supportedMimetype => $provider) { @@ -393,7 +393,7 @@ class Preview { \OC_Log::write('core', 'Generating preview for "' . $file . '" with "' . get_class($provider) . '"', \OC_Log::DEBUG); - $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileview); + $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileView); if(!($preview instanceof \OC_Image)) { continue; @@ -405,15 +405,15 @@ class Preview { $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; $cachePath = $previewPath . $maxX . '-' . $maxY . '.png'; - if($this->userview->is_dir($this->getThumbnailsFolder() . '/') === false) { - $this->userview->mkdir($this->getThumbnailsFolder() . '/'); + if($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) { + $this->userView->mkdir($this->getThumbnailsFolder() . '/'); } - if($this->userview->is_dir($previewPath) === false) { - $this->userview->mkdir($previewPath); + if($this->userView->is_dir($previewPath) === false) { + $this->userView->mkdir($previewPath); } - $this->userview->file_put_contents($cachePath, $preview->data()); + $this->userView->file_put_contents($cachePath, $preview->data()); break; } @@ -470,7 +470,7 @@ class Preview { if($x === $realx && $y === $realy) { $this->preview = $image; - return true; + return; } $factorX = $x / $realx; diff --git a/lib/preview/image.php b/lib/preview/image.php new file mode 100644 index 00000000000..9aec967282d --- /dev/null +++ b/lib/preview/image.php @@ -0,0 +1,36 @@ +getFileInfo($path); + if(!$fileInfo) { + return false; + } + + //check if file is encrypted + if($fileInfo['encrypted'] === true) { + $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r'))); + }else{ + $image = new \OC_Image(); + $image->loadFromFile($fileview->getLocalFile($path)); + } + + return $image->valid() ? $image : false; + } +} + +\OC\Preview::registerProvider('OC\Preview\Image'); \ No newline at end of file diff --git a/lib/preview/images.php b/lib/preview/images.php deleted file mode 100644 index 9aec967282d..00000000000 --- a/lib/preview/images.php +++ /dev/null @@ -1,36 +0,0 @@ -getFileInfo($path); - if(!$fileInfo) { - return false; - } - - //check if file is encrypted - if($fileInfo['encrypted'] === true) { - $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r'))); - }else{ - $image = new \OC_Image(); - $image->loadFromFile($fileview->getLocalFile($path)); - } - - return $image->valid() ? $image : false; - } -} - -\OC\Preview::registerProvider('OC\Preview\Image'); \ No newline at end of file diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/libreoffice-cl.php deleted file mode 100644 index 2f1d08499ef..00000000000 --- a/lib/preview/libreoffice-cl.php +++ /dev/null @@ -1,131 +0,0 @@ -initCmd(); - if(is_null($this->cmd)) { - return false; - } - - $absPath = $fileview->toTmpFile($path); - - $tmpDir = get_temp_dir(); - - $exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath); - $export = 'export HOME=/' . $tmpDir; - - shell_exec($export . "\n" . $exec); - - //create imagick object from pdf - try{ - $pdf = new \imagick($absPath . '.pdf' . '[0]'); - $pdf->setImageFormat('jpg'); - } catch (\Exception $e) { - unlink($absPath); - unlink($absPath . '.pdf'); - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); - return false; - } - - $image = new \OC_Image($pdf); - - unlink($absPath); - unlink($absPath . '.pdf'); - - return $image->valid() ? $image : false; - } - - private function initCmd() { - $cmd = ''; - - if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { - $cmd = \OC_Config::getValue('preview_libreoffice_path', null); - } - - $whichLibreOffice = shell_exec('which libreoffice'); - if($cmd === '' && !empty($whichLibreOffice)) { - $cmd = 'libreoffice'; - } - - $whichOpenOffice = shell_exec('which openoffice'); - if($cmd === '' && !empty($whichOpenOffice)) { - $cmd = 'openoffice'; - } - - if($cmd === '') { - $cmd = null; - } - - $this->cmd = $cmd; - } -} - -//.doc, .dot -class MSOfficeDoc extends Office { - - public function getMimeType() { - return '/application\/msword/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc'); - -//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) -class MSOffice2003 extends Office { - - public function getMimeType() { - return '/application\/vnd.ms-.*/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\MSOffice2003'); - -//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx -class MSOffice2007 extends Office { - - public function getMimeType() { - return '/application\/vnd.openxmlformats-officedocument.*/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\MSOffice2007'); - -//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt -class OpenDocument extends Office { - - public function getMimeType() { - return '/application\/vnd.oasis.opendocument.*/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\OpenDocument'); - -//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm -class StarOffice extends Office { - - public function getMimeType() { - return '/application\/vnd.sun.xml.*/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file diff --git a/lib/preview/msoffice.php b/lib/preview/msoffice.php deleted file mode 100644 index e69ab0ab8cb..00000000000 --- a/lib/preview/msoffice.php +++ /dev/null @@ -1,142 +0,0 @@ -toTmpFile($path); - - $transformdoc = new \TransformDoc(); - $transformdoc->setStrFile($tmpDoc); - $transformdoc->generatePDF($tmpDoc); - - $pdf = new \imagick($tmpDoc . '[0]'); - $pdf->setImageFormat('jpg'); - - unlink($tmpDoc); - - $image = new \OC_Image($pdf); - - return $image->valid() ? $image : false; - } - -} - -\OC\Preview::registerProvider('OC\Preview\DOCX'); - -class MSOfficeExcel extends Provider { - - public function getMimeType() { - return null; - } - - public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - require_once('PHPExcel/Classes/PHPExcel.php'); - require_once('PHPExcel/Classes/PHPExcel/IOFactory.php'); - - $absPath = $fileview->toTmpFile($path); - $tmpPath = \OC_Helper::tmpFile(); - - $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF; - $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf'; - - \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath); - - $phpexcel = new \PHPExcel($absPath); - $excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF'); - $excel->save($tmpPath); - - $pdf = new \imagick($tmpPath . '[0]'); - $pdf->setImageFormat('jpg'); - - unlink($absPath); - unlink($tmpPath); - - $image = new \OC_Image($pdf); - - return $image->valid() ? $image : false; - } - -} - -class XLS extends MSOfficeExcel { - - public function getMimeType() { - return '/application\/vnd.ms-excel/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\XLS'); - -class XLSX extends MSOfficeExcel { - - public function getMimeType() { - return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\XLSX'); - -/* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ... -class MSOfficePowerPoint extends Provider { - - public function getMimeType() { - return null; - } - - public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - return false; - } - -} - -class PPT extends MSOfficePowerPoint { - - public function getMimeType() { - return '/application\/vnd.ms-powerpoint/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\PPT'); - -class PPTX extends MSOfficePowerPoint { - - public function getMimeType() { - return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\PPTX'); -*/ \ No newline at end of file diff --git a/lib/preview/office-cl.php b/lib/preview/office-cl.php new file mode 100644 index 00000000000..112909d6523 --- /dev/null +++ b/lib/preview/office-cl.php @@ -0,0 +1,134 @@ +initCmd(); + if(is_null($this->cmd)) { + return false; + } + + $absPath = $fileview->toTmpFile($path); + + $tmpDir = get_temp_dir(); + + $defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir '; + $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters); + + $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath); + $export = 'export HOME=/' . $tmpDir; + + shell_exec($export . "\n" . $exec); + + //create imagick object from pdf + try{ + $pdf = new \imagick($absPath . '.pdf' . '[0]'); + $pdf->setImageFormat('jpg'); + } catch (\Exception $e) { + unlink($absPath); + unlink($absPath . '.pdf'); + \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + return false; + } + + $image = new \OC_Image($pdf); + + unlink($absPath); + unlink($absPath . '.pdf'); + + return $image->valid() ? $image : false; + } + + private function initCmd() { + $cmd = ''; + + if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { + $cmd = \OC_Config::getValue('preview_libreoffice_path', null); + } + + $whichLibreOffice = shell_exec('which libreoffice'); + if($cmd === '' && !empty($whichLibreOffice)) { + $cmd = 'libreoffice'; + } + + $whichOpenOffice = shell_exec('which openoffice'); + if($cmd === '' && !empty($whichOpenOffice)) { + $cmd = 'openoffice'; + } + + if($cmd === '') { + $cmd = null; + } + + $this->cmd = $cmd; + } +} + +//.doc, .dot +class MSOfficeDoc extends Office { + + public function getMimeType() { + return '/application\/msword/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc'); + +//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) +class MSOffice2003 extends Office { + + public function getMimeType() { + return '/application\/vnd.ms-.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOffice2003'); + +//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx +class MSOffice2007 extends Office { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MSOffice2007'); + +//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt +class OpenDocument extends Office { + + public function getMimeType() { + return '/application\/vnd.oasis.opendocument.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\OpenDocument'); + +//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm +class StarOffice extends Office { + + public function getMimeType() { + return '/application\/vnd.sun.xml.*/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file diff --git a/lib/preview/office-fallback.php b/lib/preview/office-fallback.php new file mode 100644 index 00000000000..e69ab0ab8cb --- /dev/null +++ b/lib/preview/office-fallback.php @@ -0,0 +1,142 @@ +toTmpFile($path); + + $transformdoc = new \TransformDoc(); + $transformdoc->setStrFile($tmpDoc); + $transformdoc->generatePDF($tmpDoc); + + $pdf = new \imagick($tmpDoc . '[0]'); + $pdf->setImageFormat('jpg'); + + unlink($tmpDoc); + + $image = new \OC_Image($pdf); + + return $image->valid() ? $image : false; + } + +} + +\OC\Preview::registerProvider('OC\Preview\DOCX'); + +class MSOfficeExcel extends Provider { + + public function getMimeType() { + return null; + } + + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + require_once('PHPExcel/Classes/PHPExcel.php'); + require_once('PHPExcel/Classes/PHPExcel/IOFactory.php'); + + $absPath = $fileview->toTmpFile($path); + $tmpPath = \OC_Helper::tmpFile(); + + $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF; + $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf'; + + \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath); + + $phpexcel = new \PHPExcel($absPath); + $excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF'); + $excel->save($tmpPath); + + $pdf = new \imagick($tmpPath . '[0]'); + $pdf->setImageFormat('jpg'); + + unlink($absPath); + unlink($tmpPath); + + $image = new \OC_Image($pdf); + + return $image->valid() ? $image : false; + } + +} + +class XLS extends MSOfficeExcel { + + public function getMimeType() { + return '/application\/vnd.ms-excel/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\XLS'); + +class XLSX extends MSOfficeExcel { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\XLSX'); + +/* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ... +class MSOfficePowerPoint extends Provider { + + public function getMimeType() { + return null; + } + + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + return false; + } + +} + +class PPT extends MSOfficePowerPoint { + + public function getMimeType() { + return '/application\/vnd.ms-powerpoint/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\PPT'); + +class PPTX extends MSOfficePowerPoint { + + public function getMimeType() { + return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\PPTX'); +*/ \ No newline at end of file diff --git a/lib/preview/office.php b/lib/preview/office.php index b93e1e57c8b..5287bbd6ac1 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -14,9 +14,9 @@ if (extension_loaded('imagick')) { $isOpenOfficeAvailable = !empty($whichOpenOffice); //let's see if there is libreoffice or openoffice on this machine if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) { - require_once('libreoffice-cl.php'); + require_once('office-cl.php'); }else{ //in case there isn't, use our fallback - require_once('msoffice.php'); + require_once('office-fallback.php'); } } \ No newline at end of file -- cgit v1.2.3 From 72e1a8d83b3a21875cac6948879471661d120c52 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 12:47:23 +0200 Subject: fixing require to Pimple --- lib/appframework/dependencyinjection/dicontainer.php | 2 +- tests/lib/appframework/AppTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 34f64e72cb9..d6cf4d55020 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -34,7 +34,7 @@ use OC\AppFramework\Middleware\Security\SecurityMiddleware; use OC\AppFramework\Utility\TimeFactory; // register 3rdparty autoloaders -require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; +require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php'; /** diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php index 000094d07c8..6e647f68e6f 100644 --- a/tests/lib/appframework/AppTest.php +++ b/tests/lib/appframework/AppTest.php @@ -29,7 +29,7 @@ use OC\AppFramework\Core\API; use OC\AppFramework\Middleware\MiddlewareDispatcher; // FIXME: loading pimpl correctly from 3rdparty repo -require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; +require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php'; require_once __DIR__ . "/classloader.php"; -- cgit v1.2.3 From 0fa2e1b3d91d243452ffdfd36dbd0bed3f27e387 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 12:48:45 +0200 Subject: there is no HttpMiddleware --- lib/appframework/dependencyinjection/dicontainer.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index d6cf4d55020..69c645b1be3 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -29,7 +29,6 @@ use OC\AppFramework\Http\Request; use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\Core\API; use OC\AppFramework\Middleware\MiddlewareDispatcher; -use OC\AppFramework\Middleware\Http\HttpMiddleware; use OC\AppFramework\Middleware\Security\SecurityMiddleware; use OC\AppFramework\Utility\TimeFactory; -- cgit v1.2.3 From cdada78aa4acd2880e0344a476d3c1d838645ae5 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 17:20:36 +0200 Subject: typos & unused var fixed --- lib/appframework/http/dispatcher.php | 11 +++++------ lib/appframework/http/downloadresponse.php | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/appframework/http/dispatcher.php b/lib/appframework/http/dispatcher.php index ab5644274fa..183854650fb 100644 --- a/lib/appframework/http/dispatcher.php +++ b/lib/appframework/http/dispatcher.php @@ -29,7 +29,7 @@ use \OC\AppFramework\Middleware\MiddlewareDispatcher; /** - * Class to dispatch the request to the middleware disptacher + * Class to dispatch the request to the middleware dispatcher */ class Dispatcher { @@ -67,11 +67,10 @@ class Dispatcher { $methodName); $response = $controller->$methodName(); - - // if an exception appears, the middleware checks if it can handle the - // exception and creates a response. If no response is created, it is - // assumed that theres no middleware who can handle it and the error is - // thrown again + // if an exception appears, the middleware checks if it can handle the + // exception and creates a response. If no response is created, it is + // assumed that theres no middleware who can handle it and the error is + // thrown again } catch(\Exception $exception){ $response = $this->middlewareDispatcher->afterException( $controller, $methodName, $exception); diff --git a/lib/appframework/http/downloadresponse.php b/lib/appframework/http/downloadresponse.php index 5a0db325fe6..096e4fc8331 100644 --- a/lib/appframework/http/downloadresponse.php +++ b/lib/appframework/http/downloadresponse.php @@ -30,7 +30,6 @@ namespace OC\AppFramework\Http; */ abstract class DownloadResponse extends Response { - private $content; private $filename; private $contentType; -- cgit v1.2.3 From 93194bb39617d4b11a0a84b8cd4caf0491155961 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 17:21:14 +0200 Subject: Introducing IContainer into public api --- .../dependencyinjection/dicontainer.php | 22 +++++------ lib/appframework/utility/simplecontainer.php | 44 ++++++++++++++++++++++ tests/lib/appframework/classloader.php | 9 +++++ 3 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 lib/appframework/utility/simplecontainer.php (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 69c645b1be3..88ad2cd414a 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -30,19 +30,11 @@ use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\Core\API; use OC\AppFramework\Middleware\MiddlewareDispatcher; use OC\AppFramework\Middleware\Security\SecurityMiddleware; +use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; -// register 3rdparty autoloaders -require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php'; - -/** - * This class extends Pimple (http://pimple.sensiolabs.org/) for reusability - * To use this class, extend your own container from this. Should you require it - * you can overwrite the dependencies with your own classes by simply redefining - * a dependency - */ -class DIContainer extends \Pimple { +class DIContainer extends SimpleContainer { /** @@ -61,8 +53,14 @@ class DIContainer extends \Pimple { * Http */ $this['Request'] = $this->share(function($c) { - $params = json_decode(file_get_contents('php://input'), true); - $params = is_array($params) ? $params: array(); + + $params = array(); + + // we json decode the body only in case of content type json + if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) { + $params = json_decode(file_get_contents('php://input'), true); + $params = is_array($params) ? $params: array(); + } return new Request( array( diff --git a/lib/appframework/utility/simplecontainer.php b/lib/appframework/utility/simplecontainer.php new file mode 100644 index 00000000000..04b6cd727b8 --- /dev/null +++ b/lib/appframework/utility/simplecontainer.php @@ -0,0 +1,44 @@ +offsetGet($name); + } + + function registerParameter($name, $value) + { + $this[$name] = $value; + } + + /** + * The given closure is call the first time the given service is queried. + * The closure has to return the instance for the given service. + * Created instance will be cached in case $shared is true. + * + * @param string $name name of the service to register another backend for + * @param callable $closure the closure to be called on service creation + */ + function registerService($name, \Closure $closure, $shared = true) + { + if ($shared) { + $this[$name] = \Pimple::share($closure); + } else { + $this[$name] = $closure; + } + } +} diff --git a/tests/lib/appframework/classloader.php b/tests/lib/appframework/classloader.php index ae485e67b2c..cd9f893df30 100644 --- a/tests/lib/appframework/classloader.php +++ b/tests/lib/appframework/classloader.php @@ -32,6 +32,15 @@ spl_autoload_register(function ($className){ } } + if (strpos($className, 'OCP\\') === 0) { + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $relPath = __DIR__ . '/../../../lib/public' . $path; + + if(file_exists($relPath)){ + require_once $relPath; + } + } + // FIXME: this will most probably not work anymore if (strpos($className, 'OCA\\') === 0) { -- cgit v1.2.3 From 6e1946ab00cca760d555222df008ba92b0185eca Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 17:22:33 +0200 Subject: Introducing IContainer into public api --- lib/public/core/icontainer.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 lib/public/core/icontainer.php (limited to 'lib') diff --git a/lib/public/core/icontainer.php b/lib/public/core/icontainer.php new file mode 100644 index 00000000000..a6c93abec67 --- /dev/null +++ b/lib/public/core/icontainer.php @@ -0,0 +1,19 @@ + Date: Tue, 20 Aug 2013 17:53:58 +0200 Subject: Introducing IRequest --- lib/appframework/http/request.php | 111 +++++++++++++++++++++++++++++++++++++- lib/public/core/irequest.php | 88 ++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 lib/public/core/irequest.php (limited to 'lib') diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php index 7d024c8605f..ab72a8db697 100644 --- a/lib/appframework/http/request.php +++ b/lib/appframework/http/request.php @@ -22,12 +22,14 @@ namespace OC\AppFramework\Http; +use OCP\Core\IRequest; + /** * Class for accessing variables in the request. * This class provides an immutable object with request variables. */ -class Request implements \ArrayAccess, \Countable { +class Request implements \ArrayAccess, \Countable, IRequest { protected $items = array(); protected $allowedKeys = array( @@ -214,4 +216,111 @@ class Request implements \ArrayAccess, \Countable { return null; } + /** + * Lets you access post and get parameters by the index + * In case of json requests the encoded json body is accessed + * + * @param string $key the key which you want to access in the URL Parameter + * placeholder, $_POST or $_GET array. + * The priority how they're returned is the following: + * 1. URL parameters + * 2. POST parameters + * 3. GET parameters + * @param mixed $default If the key is not found, this value will be returned + * @return mixed the content of the array + */ + public function getParam($key, $default = null) + { + return isset($this->parameters[$key]) + ? $this->parameters[$key] + : $default; + } + + /** + * Returns all params that were received, be it from the request + * (as GET or POST) or throuh the URL by the route + * @return array the array with all parameters + */ + public function getParams() + { + return $this->parameters; + } + + /** + * Returns the method of the request + * @return string the method of the request (POST, GET, etc) + */ + public function getMethod() + { + return $this->method; + } + + /** + * Shortcut for accessing an uploaded file through the $_FILES array + * @param string $key the key that will be taken from the $_FILES array + * @return array the file in the $_FILES element + */ + public function getUploadedFile($key) + { + return isset($this->files[$key]) ? $this->files[$key] : null; + } + + /** + * Shortcut for getting env variables + * @param string $key the key that will be taken from the $_ENV array + * @return array the value in the $_ENV element + */ + public function getEnv($key) + { + return isset($this->env[$key]) ? $this->env[$key] : null; + } + + /** + * Shortcut for getting session variables + * @param string $key the key that will be taken from the $_SESSION array + * @return array the value in the $_SESSION element + */ + function getSession($key) + { + return isset($this->session[$key]) ? $this->session[$key] : null; + } + + /** + * Shortcut for getting cookie variables + * @param string $key the key that will be taken from the $_COOKIE array + * @return array the value in the $_COOKIE element + */ + function getCookie($key) + { + return isset($this->cookies[$key]) ? $this->cookies[$key] : null; + } + + /** + * Returns the request body content. + * + * @param Boolean $asResource If true, a resource will be returned + * + * @return string|resource The request body content or a resource to read the body stream. + * + * @throws \LogicException + */ + function getContent($asResource = false) + { + return null; +// if (false === $this->content || (true === $asResource && null !== $this->content)) { +// throw new \LogicException('getContent() can only be called once when using the resource return type.'); +// } +// +// if (true === $asResource) { +// $this->content = false; +// +// return fopen('php://input', 'rb'); +// } +// +// if (null === $this->content) { +// $this->content = file_get_contents('php://input'); +// } +// +// return $this->content; + } } diff --git a/lib/public/core/irequest.php b/lib/public/core/irequest.php new file mode 100644 index 00000000000..f283e9cb25c --- /dev/null +++ b/lib/public/core/irequest.php @@ -0,0 +1,88 @@ + Date: Tue, 20 Aug 2013 21:05:55 +0200 Subject: controller reuses IRequest methods --- lib/appframework/controller/controller.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php index 3e8166050d7..f6f34618ec6 100644 --- a/lib/appframework/controller/controller.php +++ b/lib/appframework/controller/controller.php @@ -63,9 +63,7 @@ abstract class Controller { * @return mixed the content of the array */ public function params($key, $default=null){ - return isset($this->request->parameters[$key]) - ? $this->request->parameters[$key] - : $default; + return $this->request->getParam($key, $default); } @@ -75,7 +73,7 @@ abstract class Controller { * @return array the array with all parameters */ public function getParams() { - return $this->request->parameters; + return $this->request->getParams(); } @@ -84,7 +82,7 @@ abstract class Controller { * @return string the method of the request (POST, GET, etc) */ public function method() { - return $this->request->method; + return $this->request->getMethod(); } @@ -94,7 +92,7 @@ abstract class Controller { * @return array the file in the $_FILES element */ public function getUploadedFile($key) { - return isset($this->request->files[$key]) ? $this->request->files[$key] : null; + return $this->request->getUploadedFile($key); } @@ -104,7 +102,7 @@ abstract class Controller { * @return array the value in the $_ENV element */ public function env($key) { - return isset($this->request->env[$key]) ? $this->request->env[$key] : null; + return $this->request->getEnv($key); } @@ -114,7 +112,7 @@ abstract class Controller { * @return array the value in the $_SESSION element */ public function session($key) { - return isset($this->request->session[$key]) ? $this->request->session[$key] : null; + return $this->request->getSession($key); } @@ -124,7 +122,7 @@ abstract class Controller { * @return array the value in the $_COOKIE element */ public function cookie($key) { - return isset($this->request->cookies[$key]) ? $this->request->cookies[$key] : null; + return $this->request->getCookie($key); } -- cgit v1.2.3 From 395deacc6760564544a76338023d9b0bf39e0bfe Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 20 Aug 2013 21:21:21 +0200 Subject: reducing controller annotations to: @PublicPage - No user logon is expected @NoAdminRequired - the login user requires no admin rights @NoCSRFRequired - the incoming request will not check for CSRF token --- .../middleware/security/securitymiddleware.php | 19 +-- .../middleware/security/SecurityMiddlewareTest.php | 156 +++++---------------- 2 files changed, 41 insertions(+), 134 deletions(-) (limited to 'lib') diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/appframework/middleware/security/securitymiddleware.php index 7a715f309a0..52818b1b53e 100644 --- a/lib/appframework/middleware/security/securitymiddleware.php +++ b/lib/appframework/middleware/security/securitymiddleware.php @@ -77,25 +77,20 @@ class SecurityMiddleware extends Middleware { $this->api->activateNavigationEntry(); // security checks - if(!$annotationReader->hasAnnotation('IsLoggedInExemption')) { + $isPublicPage = $annotationReader->hasAnnotation('PublicPage'); + if(!$isPublicPage) { if(!$this->api->isLoggedIn()) { throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED); } - } - - if(!$annotationReader->hasAnnotation('IsAdminExemption')) { - if(!$this->api->isAdminUser($this->api->getUserId())) { - throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN); - } - } - if(!$annotationReader->hasAnnotation('IsSubAdminExemption')) { - if(!$this->api->isSubAdminUser($this->api->getUserId())) { - throw new SecurityException('Logged in user must be a subadmin', Http::STATUS_FORBIDDEN); + if(!$annotationReader->hasAnnotation('NoAdminRequired')) { + if(!$this->api->isAdminUser($this->api->getUserId())) { + throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN); + } } } - if(!$annotationReader->hasAnnotation('CSRFExemption')) { + if(!$annotationReader->hasAnnotation('NoCSRFRequired')) { if(!$this->api->passesCSRFCheck()) { throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); } diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index 0b2103564e4..90a19c9999d 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -80,67 +80,27 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage + * @NoCSRFRequired */ public function testSetNavigationEntry(){ $this->checkNavEntry('testSetNavigationEntry', true); } - private function ajaxExceptionCheck($method, $shouldBeAjax=false){ - $api = $this->getAPI(); - $api->expects($this->any()) - ->method('passesCSRFCheck') - ->will($this->returnValue(false)); - - $sec = new SecurityMiddleware($api, $this->request); - - try { - $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', - $method); - } catch (SecurityException $ex){ - if($shouldBeAjax){ - $this->assertTrue($ex->isAjax()); - } else { - $this->assertFalse($ex->isAjax()); - } - - } - } - - - /** - * @Ajax - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption - */ - public function testAjaxException(){ - $this->ajaxExceptionCheck('testAjaxException'); - } - - - /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption - */ - public function testNoAjaxException(){ - $this->ajaxExceptionCheck('testNoAjaxException'); - } - - private function ajaxExceptionStatus($method, $test, $status) { $api = $this->getAPI(); $api->expects($this->any()) ->method($test) ->will($this->returnValue(false)); + // isAdminUser requires isLoggedIn call to return true + if ($test === 'isAdminUser') { + $api->expects($this->any()) + ->method('isLoggedIn') + ->will($this->returnValue(true)); + } + $sec = new SecurityMiddleware($api, $this->request); try { @@ -151,9 +111,6 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } } - /** - * @Ajax - */ public function testAjaxStatusLoggedInCheck() { $this->ajaxExceptionStatus( 'testAjaxStatusLoggedInCheck', @@ -163,8 +120,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } /** - * @Ajax - * @IsLoggedInExemption + * @NoCSRFRequired + * @NoAdminRequired */ public function testAjaxNotAdminCheck() { $this->ajaxExceptionStatus( @@ -175,23 +132,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } /** - * @Ajax - * @IsLoggedInExemption - * @IsAdminExemption - */ - public function testAjaxNotSubAdminCheck() { - $this->ajaxExceptionStatus( - 'testAjaxNotSubAdminCheck', - 'isSubAdminUser', - Http::STATUS_FORBIDDEN - ); - } - - /** - * @Ajax - * @IsLoggedInExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage */ public function testAjaxStatusCSRFCheck() { $this->ajaxExceptionStatus( @@ -202,11 +143,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } /** - * @Ajax - * @CSRFExemption - * @IsLoggedInExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage + * @NoCSRFRequired */ public function testAjaxStatusAllGood() { $this->ajaxExceptionStatus( @@ -231,11 +169,10 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ); } + /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage + * @NoCSRFRequired */ public function testNoChecks(){ $api = $this->getAPI(); @@ -245,9 +182,6 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { $api->expects($this->never()) ->method('isAdminUser') ->will($this->returnValue(true)); - $api->expects($this->never()) - ->method('isSubAdminUser') - ->will($this->returnValue(true)); $api->expects($this->never()) ->method('isLoggedIn') ->will($this->returnValue(true)); @@ -264,10 +198,19 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->method($expects) ->will($this->returnValue(!$shouldFail)); + // admin check requires login + if ($expects === 'isAdminUser') { + $api->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(true)); + } + $sec = new SecurityMiddleware($api, $this->request); if($shouldFail){ $this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException'); + } else { + $this->setExpectedException(null); } $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); @@ -275,9 +218,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @IsLoggedInExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage */ public function testCsrfCheck(){ $this->securityCheck('testCsrfCheck', 'passesCSRFCheck'); @@ -285,9 +226,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @IsLoggedInExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @PublicPage */ public function testFailCsrfCheck(){ $this->securityCheck('testFailCsrfCheck', 'passesCSRFCheck', true); @@ -295,9 +234,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @NoCSRFRequired + * @NoAdminRequired */ public function testLoggedInCheck(){ $this->securityCheck('testLoggedInCheck', 'isLoggedIn'); @@ -305,9 +243,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @CSRFExemption - * @IsAdminExemption - * @IsSubAdminExemption + * @NoCSRFRequired + * @NoAdminRequired */ public function testFailLoggedInCheck(){ $this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true); @@ -315,9 +252,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsSubAdminExemption + * @NoCSRFRequired */ public function testIsAdminCheck(){ $this->securityCheck('testIsAdminCheck', 'isAdminUser'); @@ -325,36 +260,13 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsSubAdminExemption + * @NoCSRFRequired */ public function testFailIsAdminCheck(){ $this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true); } - /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - */ - public function testIsSubAdminCheck(){ - $this->securityCheck('testIsSubAdminCheck', 'isSubAdminUser'); - } - - - /** - * @IsLoggedInExemption - * @CSRFExemption - * @IsAdminExemption - */ - public function testFailIsSubAdminCheck(){ - $this->securityCheck('testFailIsSubAdminCheck', 'isSubAdminUser', true); - } - - - public function testAfterExceptionNotCaughtThrowsItAgain(){ $ex = new \Exception(); $this->setExpectedException('\Exception'); -- cgit v1.2.3 From ba029ef4b27cfeabbc67523131fa473397b77f01 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 21 Aug 2013 00:58:15 +0200 Subject: initial setup of the server container --- lib/base.php | 8 ++++++++ lib/public/core/iservercontainer.php | 14 ++++++++++++++ lib/server.php | 15 +++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 lib/public/core/iservercontainer.php create mode 100644 lib/server.php (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index eaee8424651..a81f1a59b8a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -84,6 +84,11 @@ class OC { */ public static $loader = null; + /** + * @var \OC\Server + */ + public static $server = null; + public static function initPaths() { // calculate the root directories OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4)); @@ -361,6 +366,9 @@ class OC { self::$loader->registerPrefix('Patchwork', '3rdparty'); spl_autoload_register(array(self::$loader, 'load')); + // setup the basic server + self::$server = new \OC\Server(); + // set some stuff //ob_start(); error_reporting(E_ALL | E_STRICT); diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php new file mode 100644 index 00000000000..df744ab6fdf --- /dev/null +++ b/lib/public/core/iservercontainer.php @@ -0,0 +1,14 @@ + Date: Wed, 21 Aug 2013 00:58:33 +0200 Subject: typo --- lib/public/core/irequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/core/irequest.php b/lib/public/core/irequest.php index f283e9cb25c..fc2004d1835 100644 --- a/lib/public/core/irequest.php +++ b/lib/public/core/irequest.php @@ -32,7 +32,7 @@ interface IRequest { /** * Returns all params that were received, be it from the request - * (as GET or POST) or throuh the URL by the route + * (as GET or POST) or through the URL by the route * @return array the array with all parameters */ public function getParams(); -- cgit v1.2.3 From 911bd3c16f508eb8f3cb9b03a5a21e2aa72ebf79 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 21 Aug 2013 01:00:26 +0200 Subject: moving response classes over to OCP --- lib/appframework/controller/controller.php | 4 +- lib/appframework/http/dispatcher.php | 3 + lib/appframework/http/downloadresponse.php | 2 +- lib/appframework/http/http.php | 62 +------- lib/appframework/http/jsonresponse.php | 74 --------- lib/appframework/http/redirectresponse.php | 2 + lib/appframework/http/response.php | 169 --------------------- lib/appframework/http/templateresponse.php | 126 --------------- lib/appframework/middleware/middleware.php | 2 +- .../middleware/middlewaredispatcher.php | 2 +- .../middleware/security/securitymiddleware.php | 4 +- lib/public/appframework/http/http.php | 89 +++++++++++ lib/public/appframework/http/jsonresponse.php | 74 +++++++++ lib/public/appframework/http/response.php | 169 +++++++++++++++++++++ lib/public/appframework/http/templateresponse.php | 126 +++++++++++++++ 15 files changed, 471 insertions(+), 437 deletions(-) delete mode 100644 lib/appframework/http/jsonresponse.php delete mode 100644 lib/appframework/http/response.php delete mode 100644 lib/appframework/http/templateresponse.php create mode 100644 lib/public/appframework/http/http.php create mode 100644 lib/public/appframework/http/jsonresponse.php create mode 100644 lib/public/appframework/http/response.php create mode 100644 lib/public/appframework/http/templateresponse.php (limited to 'lib') diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php index f6f34618ec6..a7498ba0e1e 100644 --- a/lib/appframework/controller/controller.php +++ b/lib/appframework/controller/controller.php @@ -24,9 +24,9 @@ namespace OC\AppFramework\Controller; -use OC\AppFramework\Http\TemplateResponse; use OC\AppFramework\Http\Request; use OC\AppFramework\Core\API; +use OCP\AppFramework\Http\TemplateResponse; /** @@ -133,7 +133,7 @@ abstract class Controller { * @param string $renderAs user renders a full page, blank only your template * admin an entry in the admin settings * @param array $headers set additional headers in name/value pairs - * @return \OC\AppFramework\Http\TemplateResponse containing the page + * @return \OCP\AppFramework\Http\TemplateResponse containing the page */ public function render($templateName, array $params=array(), $renderAs='user', array $headers=array()){ diff --git a/lib/appframework/http/dispatcher.php b/lib/appframework/http/dispatcher.php index 183854650fb..ea57a6860cc 100644 --- a/lib/appframework/http/dispatcher.php +++ b/lib/appframework/http/dispatcher.php @@ -74,6 +74,9 @@ class Dispatcher { } catch(\Exception $exception){ $response = $this->middlewareDispatcher->afterException( $controller, $methodName, $exception); + if (is_null($response)) { + throw $exception; + } } $response = $this->middlewareDispatcher->afterController( diff --git a/lib/appframework/http/downloadresponse.php b/lib/appframework/http/downloadresponse.php index 096e4fc8331..67b9542dba6 100644 --- a/lib/appframework/http/downloadresponse.php +++ b/lib/appframework/http/downloadresponse.php @@ -28,7 +28,7 @@ namespace OC\AppFramework\Http; /** * Prompts the user to download the a file */ -abstract class DownloadResponse extends Response { +class DownloadResponse extends \OCP\AppFramework\Http\Response { private $filename; private $contentType; diff --git a/lib/appframework/http/http.php b/lib/appframework/http/http.php index 73f32d13b38..e00dc9cdc4a 100644 --- a/lib/appframework/http/http.php +++ b/lib/appframework/http/http.php @@ -25,67 +25,7 @@ namespace OC\AppFramework\Http; -class Http { - - const STATUS_CONTINUE = 100; - const STATUS_SWITCHING_PROTOCOLS = 101; - const STATUS_PROCESSING = 102; - const STATUS_OK = 200; - const STATUS_CREATED = 201; - const STATUS_ACCEPTED = 202; - const STATUS_NON_AUTHORATIVE_INFORMATION = 203; - const STATUS_NO_CONTENT = 204; - const STATUS_RESET_CONTENT = 205; - const STATUS_PARTIAL_CONTENT = 206; - const STATUS_MULTI_STATUS = 207; - const STATUS_ALREADY_REPORTED = 208; - const STATUS_IM_USED = 226; - const STATUS_MULTIPLE_CHOICES = 300; - const STATUS_MOVED_PERMANENTLY = 301; - const STATUS_FOUND = 302; - const STATUS_SEE_OTHER = 303; - const STATUS_NOT_MODIFIED = 304; - const STATUS_USE_PROXY = 305; - const STATUS_RESERVED = 306; - const STATUS_TEMPORARY_REDIRECT = 307; - const STATUS_BAD_REQUEST = 400; - const STATUS_UNAUTHORIZED = 401; - const STATUS_PAYMENT_REQUIRED = 402; - const STATUS_FORBIDDEN = 403; - const STATUS_NOT_FOUND = 404; - const STATUS_METHOD_NOT_ALLOWED = 405; - const STATUS_NOT_ACCEPTABLE = 406; - const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407; - const STATUS_REQUEST_TIMEOUT = 408; - const STATUS_CONFLICT = 409; - const STATUS_GONE = 410; - const STATUS_LENGTH_REQUIRED = 411; - const STATUS_PRECONDITION_FAILED = 412; - const STATUS_REQUEST_ENTITY_TOO_LARGE = 413; - const STATUS_REQUEST_URI_TOO_LONG = 414; - const STATUS_UNSUPPORTED_MEDIA_TYPE = 415; - const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416; - const STATUS_EXPECTATION_FAILED = 417; - const STATUS_IM_A_TEAPOT = 418; - const STATUS_UNPROCESSABLE_ENTITY = 422; - const STATUS_LOCKED = 423; - const STATUS_FAILED_DEPENDENCY = 424; - const STATUS_UPGRADE_REQUIRED = 426; - const STATUS_PRECONDITION_REQUIRED = 428; - const STATUS_TOO_MANY_REQUESTS = 429; - const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; - const STATUS_INTERNAL_SERVER_ERROR = 500; - const STATUS_NOT_IMPLEMENTED = 501; - const STATUS_BAD_GATEWAY = 502; - const STATUS_SERVICE_UNAVAILABLE = 503; - const STATUS_GATEWAY_TIMEOUT = 504; - const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505; - const STATUS_VARIANT_ALSO_NEGOTIATES = 506; - const STATUS_INSUFFICIENT_STORAGE = 507; - const STATUS_LOOP_DETECTED = 508; - const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509; - const STATUS_NOT_EXTENDED = 510; - const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511; +class Http extends \OCP\AppFramework\Http\Http{ private $server; private $protocolVersion; diff --git a/lib/appframework/http/jsonresponse.php b/lib/appframework/http/jsonresponse.php deleted file mode 100644 index 750f8a2ad15..00000000000 --- a/lib/appframework/http/jsonresponse.php +++ /dev/null @@ -1,74 +0,0 @@ -. - * - */ - - -namespace OC\AppFramework\Http; - - -/** - * A renderer for JSON calls - */ -class JSONResponse extends Response { - - protected $data; - - - /** - * @param array|object $data the object or array that should be transformed - * @param int $statusCode the Http status code, defaults to 200 - */ - public function __construct($data=array(), $statusCode=Http::STATUS_OK) { - $this->data = $data; - $this->setStatus($statusCode); - $this->addHeader('X-Content-Type-Options', 'nosniff'); - $this->addHeader('Content-type', 'application/json; charset=utf-8'); - } - - - /** - * Returns the rendered json - * @return string the rendered json - */ - public function render(){ - return json_encode($this->data); - } - - /** - * Sets values in the data json array - * @param array|object $params an array or object which will be transformed - * to JSON - */ - public function setData($data){ - $this->data = $data; - } - - - /** - * Used to get the set parameters - * @return array the data - */ - public function getData(){ - return $this->data; - } - -} diff --git a/lib/appframework/http/redirectresponse.php b/lib/appframework/http/redirectresponse.php index 727e0fb642e..688447f1618 100644 --- a/lib/appframework/http/redirectresponse.php +++ b/lib/appframework/http/redirectresponse.php @@ -24,6 +24,8 @@ namespace OC\AppFramework\Http; +use OCP\AppFramework\Http\Response; + /** * Redirects to a different URL diff --git a/lib/appframework/http/response.php b/lib/appframework/http/response.php deleted file mode 100644 index 50778105f24..00000000000 --- a/lib/appframework/http/response.php +++ /dev/null @@ -1,169 +0,0 @@ -. - * - */ - - -namespace OC\AppFramework\Http; - - -/** - * Base class for responses. Also used to just send headers - */ -class Response { - - /** - * @var array default headers - */ - private $headers = array( - 'Cache-Control' => 'no-cache, must-revalidate' - ); - - - /** - * @var string - */ - private $status = Http::STATUS_OK; - - - /** - * @var \DateTime - */ - private $lastModified; - - - /** - * @var string - */ - private $ETag; - - - /** - * Caches the response - * @param int $cacheSeconds the amount of seconds that should be cached - * if 0 then caching will be disabled - */ - public function cacheFor($cacheSeconds) { - - if($cacheSeconds > 0) { - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . - ', must-revalidate'); - } else { - $this->addHeader('Cache-Control', 'no-cache, must-revalidate'); - } - - } - - - /** - * Adds a new header to the response that will be called before the render - * function - * @param string $name The name of the HTTP header - * @param string $value The value, null will delete it - */ - public function addHeader($name, $value) { - if(is_null($value)) { - unset($this->headers[$name]); - } else { - $this->headers[$name] = $value; - } - } - - - /** - * Returns the set headers - * @return array the headers - */ - public function getHeaders() { - $mergeWith = array(); - - if($this->lastModified) { - $mergeWith['Last-Modified'] = - $this->lastModified->format(\DateTime::RFC2822); - } - - if($this->ETag) { - $mergeWith['ETag'] = '"' . $this->ETag . '"'; - } - - return array_merge($mergeWith, $this->headers); - } - - - /** - * By default renders no output - * @return null - */ - public function render() { - return null; - } - - - /** - * Set response status - * @param int $status a HTTP status code, see also the STATUS constants - */ - public function setStatus($status) { - $this->status = $status; - } - - - /** - * Get response status - */ - public function getStatus() { - return $this->status; - } - - - /** - * @return string the etag - */ - public function getETag() { - return $this->ETag; - } - - - /** - * @return string RFC2822 formatted last modified date - */ - public function getLastModified() { - return $this->lastModified; - } - - - /** - * @param string $ETag - */ - public function setETag($ETag) { - $this->ETag = $ETag; - } - - - /** - * @param \DateTime $lastModified - */ - public function setLastModified($lastModified) { - $this->lastModified = $lastModified; - } - - -} diff --git a/lib/appframework/http/templateresponse.php b/lib/appframework/http/templateresponse.php deleted file mode 100644 index 0a32da4b1b4..00000000000 --- a/lib/appframework/http/templateresponse.php +++ /dev/null @@ -1,126 +0,0 @@ -. - * - */ - - -namespace OC\AppFramework\Http; - -use OC\AppFramework\Core\API; - - -/** - * Response for a normal template - */ -class TemplateResponse extends Response { - - protected $templateName; - protected $params; - protected $api; - protected $renderAs; - protected $appName; - - /** - * @param API $api an API instance - * @param string $templateName the name of the template - * @param string $appName optional if you want to include a template from - * a different app - */ - public function __construct(API $api, $templateName, $appName=null) { - $this->templateName = $templateName; - $this->appName = $appName; - $this->api = $api; - $this->params = array(); - $this->renderAs = 'user'; - } - - - /** - * Sets template parameters - * @param array $params an array with key => value structure which sets template - * variables - */ - public function setParams(array $params){ - $this->params = $params; - } - - - /** - * Used for accessing the set parameters - * @return array the params - */ - public function getParams(){ - return $this->params; - } - - - /** - * Used for accessing the name of the set template - * @return string the name of the used template - */ - public function getTemplateName(){ - return $this->templateName; - } - - - /** - * Sets the template page - * @param string $renderAs admin, user or blank. Admin also prints the admin - * settings header and footer, user renders the normal - * normal page including footer and header and blank - * just renders the plain template - */ - public function renderAs($renderAs){ - $this->renderAs = $renderAs; - } - - - /** - * Returns the set renderAs - * @return string the renderAs value - */ - public function getRenderAs(){ - return $this->renderAs; - } - - - /** - * Returns the rendered html - * @return string the rendered html - */ - public function render(){ - - if($this->appName !== null){ - $appName = $this->appName; - } else { - $appName = $this->api->getAppName(); - } - - $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName); - - foreach($this->params as $key => $value){ - $template->assign($key, $value); - } - - return $template->fetchPage(); - } - -} diff --git a/lib/appframework/middleware/middleware.php b/lib/appframework/middleware/middleware.php index 4df88490468..b12c03c3eb8 100644 --- a/lib/appframework/middleware/middleware.php +++ b/lib/appframework/middleware/middleware.php @@ -24,7 +24,7 @@ namespace OC\AppFramework\Middleware; -use OC\AppFramework\Http\Response; +use OCP\AppFramework\Http\Response; /** diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/appframework/middleware/middlewaredispatcher.php index c2d16134dc5..70ab108e6b8 100644 --- a/lib/appframework/middleware/middlewaredispatcher.php +++ b/lib/appframework/middleware/middlewaredispatcher.php @@ -25,7 +25,7 @@ namespace OC\AppFramework\Middleware; use OC\AppFramework\Controller\Controller; -use OC\AppFramework\Http\Response; +use OCP\AppFramework\Http\Response; /** diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/appframework/middleware/security/securitymiddleware.php index 52818b1b53e..4f1447e1afb 100644 --- a/lib/appframework/middleware/security/securitymiddleware.php +++ b/lib/appframework/middleware/security/securitymiddleware.php @@ -27,12 +27,12 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Controller\Controller; use OC\AppFramework\Http\Http; use OC\AppFramework\Http\Request; -use OC\AppFramework\Http\Response; -use OC\AppFramework\Http\JSONResponse; use OC\AppFramework\Http\RedirectResponse; use OC\AppFramework\Utility\MethodAnnotationReader; use OC\AppFramework\Middleware\Middleware; use OC\AppFramework\Core\API; +use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Http\JSONResponse; /** diff --git a/lib/public/appframework/http/http.php b/lib/public/appframework/http/http.php new file mode 100644 index 00000000000..9eafe782726 --- /dev/null +++ b/lib/public/appframework/http/http.php @@ -0,0 +1,89 @@ +. + * + */ + + +namespace OCP\AppFramework\Http; + + +class Http { + + const STATUS_CONTINUE = 100; + const STATUS_SWITCHING_PROTOCOLS = 101; + const STATUS_PROCESSING = 102; + const STATUS_OK = 200; + const STATUS_CREATED = 201; + const STATUS_ACCEPTED = 202; + const STATUS_NON_AUTHORATIVE_INFORMATION = 203; + const STATUS_NO_CONTENT = 204; + const STATUS_RESET_CONTENT = 205; + const STATUS_PARTIAL_CONTENT = 206; + const STATUS_MULTI_STATUS = 207; + const STATUS_ALREADY_REPORTED = 208; + const STATUS_IM_USED = 226; + const STATUS_MULTIPLE_CHOICES = 300; + const STATUS_MOVED_PERMANENTLY = 301; + const STATUS_FOUND = 302; + const STATUS_SEE_OTHER = 303; + const STATUS_NOT_MODIFIED = 304; + const STATUS_USE_PROXY = 305; + const STATUS_RESERVED = 306; + const STATUS_TEMPORARY_REDIRECT = 307; + const STATUS_BAD_REQUEST = 400; + const STATUS_UNAUTHORIZED = 401; + const STATUS_PAYMENT_REQUIRED = 402; + const STATUS_FORBIDDEN = 403; + const STATUS_NOT_FOUND = 404; + const STATUS_METHOD_NOT_ALLOWED = 405; + const STATUS_NOT_ACCEPTABLE = 406; + const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407; + const STATUS_REQUEST_TIMEOUT = 408; + const STATUS_CONFLICT = 409; + const STATUS_GONE = 410; + const STATUS_LENGTH_REQUIRED = 411; + const STATUS_PRECONDITION_FAILED = 412; + const STATUS_REQUEST_ENTITY_TOO_LARGE = 413; + const STATUS_REQUEST_URI_TOO_LONG = 414; + const STATUS_UNSUPPORTED_MEDIA_TYPE = 415; + const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416; + const STATUS_EXPECTATION_FAILED = 417; + const STATUS_IM_A_TEAPOT = 418; + const STATUS_UNPROCESSABLE_ENTITY = 422; + const STATUS_LOCKED = 423; + const STATUS_FAILED_DEPENDENCY = 424; + const STATUS_UPGRADE_REQUIRED = 426; + const STATUS_PRECONDITION_REQUIRED = 428; + const STATUS_TOO_MANY_REQUESTS = 429; + const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; + const STATUS_INTERNAL_SERVER_ERROR = 500; + const STATUS_NOT_IMPLEMENTED = 501; + const STATUS_BAD_GATEWAY = 502; + const STATUS_SERVICE_UNAVAILABLE = 503; + const STATUS_GATEWAY_TIMEOUT = 504; + const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505; + const STATUS_VARIANT_ALSO_NEGOTIATES = 506; + const STATUS_INSUFFICIENT_STORAGE = 507; + const STATUS_LOOP_DETECTED = 508; + const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509; + const STATUS_NOT_EXTENDED = 510; + const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511; +} diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php new file mode 100644 index 00000000000..085fdbed2f9 --- /dev/null +++ b/lib/public/appframework/http/jsonresponse.php @@ -0,0 +1,74 @@ +. + * + */ + + +namespace OCP\AppFramework\Http; + + +/** + * A renderer for JSON calls + */ +class JSONResponse extends Response { + + protected $data; + + + /** + * @param array|object $data the object or array that should be transformed + * @param int $statusCode the Http status code, defaults to 200 + */ + public function __construct($data=array(), $statusCode=Http::STATUS_OK) { + $this->data = $data; + $this->setStatus($statusCode); + $this->addHeader('X-Content-Type-Options', 'nosniff'); + $this->addHeader('Content-type', 'application/json; charset=utf-8'); + } + + + /** + * Returns the rendered json + * @return string the rendered json + */ + public function render(){ + return json_encode($this->data); + } + + /** + * Sets values in the data json array + * @param array|object $params an array or object which will be transformed + * to JSON + */ + public function setData($data){ + $this->data = $data; + } + + + /** + * Used to get the set parameters + * @return array the data + */ + public function getData(){ + return $this->data; + } + +} diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php new file mode 100644 index 00000000000..64477258948 --- /dev/null +++ b/lib/public/appframework/http/response.php @@ -0,0 +1,169 @@ +. + * + */ + + +namespace OCP\AppFramework\Http; + + +/** + * Base class for responses. Also used to just send headers + */ +class Response { + + /** + * @var array default headers + */ + private $headers = array( + 'Cache-Control' => 'no-cache, must-revalidate' + ); + + + /** + * @var string + */ + private $status = Http::STATUS_OK; + + + /** + * @var \DateTime + */ + private $lastModified; + + + /** + * @var string + */ + private $ETag; + + + /** + * Caches the response + * @param int $cacheSeconds the amount of seconds that should be cached + * if 0 then caching will be disabled + */ + public function cacheFor($cacheSeconds) { + + if($cacheSeconds > 0) { + $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . + ', must-revalidate'); + } else { + $this->addHeader('Cache-Control', 'no-cache, must-revalidate'); + } + + } + + + /** + * Adds a new header to the response that will be called before the render + * function + * @param string $name The name of the HTTP header + * @param string $value The value, null will delete it + */ + public function addHeader($name, $value) { + if(is_null($value)) { + unset($this->headers[$name]); + } else { + $this->headers[$name] = $value; + } + } + + + /** + * Returns the set headers + * @return array the headers + */ + public function getHeaders() { + $mergeWith = array(); + + if($this->lastModified) { + $mergeWith['Last-Modified'] = + $this->lastModified->format(\DateTime::RFC2822); + } + + if($this->ETag) { + $mergeWith['ETag'] = '"' . $this->ETag . '"'; + } + + return array_merge($mergeWith, $this->headers); + } + + + /** + * By default renders no output + * @return null + */ + public function render() { + return null; + } + + + /** + * Set response status + * @param int $status a HTTP status code, see also the STATUS constants + */ + public function setStatus($status) { + $this->status = $status; + } + + + /** + * Get response status + */ + public function getStatus() { + return $this->status; + } + + + /** + * @return string the etag + */ + public function getETag() { + return $this->ETag; + } + + + /** + * @return string RFC2822 formatted last modified date + */ + public function getLastModified() { + return $this->lastModified; + } + + + /** + * @param string $ETag + */ + public function setETag($ETag) { + $this->ETag = $ETag; + } + + + /** + * @param \DateTime $lastModified + */ + public function setLastModified($lastModified) { + $this->lastModified = $lastModified; + } + + +} diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php new file mode 100644 index 00000000000..97678c96cba --- /dev/null +++ b/lib/public/appframework/http/templateresponse.php @@ -0,0 +1,126 @@ +. + * + */ + + +namespace OCP\AppFramework\Http; + +use OC\AppFramework\Core\API; + + +/** + * Response for a normal template + */ +class TemplateResponse extends Response { + + protected $templateName; + protected $params; + protected $api; + protected $renderAs; + protected $appName; + + /** + * @param API $api an API instance + * @param string $templateName the name of the template + * @param string $appName optional if you want to include a template from + * a different app + */ + public function __construct(API $api, $templateName, $appName=null) { + $this->templateName = $templateName; + $this->appName = $appName; + $this->api = $api; + $this->params = array(); + $this->renderAs = 'user'; + } + + + /** + * Sets template parameters + * @param array $params an array with key => value structure which sets template + * variables + */ + public function setParams(array $params){ + $this->params = $params; + } + + + /** + * Used for accessing the set parameters + * @return array the params + */ + public function getParams(){ + return $this->params; + } + + + /** + * Used for accessing the name of the set template + * @return string the name of the used template + */ + public function getTemplateName(){ + return $this->templateName; + } + + + /** + * Sets the template page + * @param string $renderAs admin, user or blank. Admin also prints the admin + * settings header and footer, user renders the normal + * normal page including footer and header and blank + * just renders the plain template + */ + public function renderAs($renderAs){ + $this->renderAs = $renderAs; + } + + + /** + * Returns the set renderAs + * @return string the renderAs value + */ + public function getRenderAs(){ + return $this->renderAs; + } + + + /** + * Returns the rendered html + * @return string the rendered html + */ + public function render(){ + + if($this->appName !== null){ + $appName = $this->appName; + } else { + $appName = $this->api->getAppName(); + } + + $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName); + + foreach($this->params as $key => $value){ + $template->assign($key, $value); + } + + return $template->fetchPage(); + } + +} -- cgit v1.2.3 From 38f9df429397619482e3e3f7ffb0db5274222e4c Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 21 Aug 2013 01:02:15 +0200 Subject: introducing OCP\AppFramework\App --- lib/appframework/app.php | 3 +- lib/appframework/core/api.php | 3 +- .../dependencyinjection/dicontainer.php | 21 +- lib/public/appframework/App.php | 61 ++++++ lib/public/appframework/iapi.php | 238 +++++++++++++++++++++ lib/public/appframework/iappcontainer.php | 25 +++ 6 files changed, 348 insertions(+), 3 deletions(-) create mode 100644 lib/public/appframework/App.php create mode 100644 lib/public/appframework/iapi.php create mode 100644 lib/public/appframework/iappcontainer.php (limited to 'lib') diff --git a/lib/appframework/app.php b/lib/appframework/app.php index 6224b858bbf..7ff55bb809d 100644 --- a/lib/appframework/app.php +++ b/lib/appframework/app.php @@ -25,6 +25,7 @@ namespace OC\AppFramework; use OC\AppFramework\DependencyInjection\DIContainer; +use OCP\AppFramework\IAppContainer; /** @@ -45,7 +46,7 @@ class App { * @param DIContainer $container an instance of a pimple container. */ public static function main($controllerName, $methodName, array $urlParams, - DIContainer $container) { + IAppContainer $container) { $container['urlParams'] = $urlParams; $controller = $container[$controllerName]; diff --git a/lib/appframework/core/api.php b/lib/appframework/core/api.php index eb8ee01e5db..337e3b57d6d 100644 --- a/lib/appframework/core/api.php +++ b/lib/appframework/core/api.php @@ -23,6 +23,7 @@ namespace OC\AppFramework\Core; +use OCP\AppFramework\IApi; /** @@ -32,7 +33,7 @@ namespace OC\AppFramework\Core; * Should you find yourself in need for more methods, simply inherit from this * class and add your methods */ -class API { +class API implements IApi{ private $appName; diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 88ad2cd414a..43f6eee29b0 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -32,9 +32,11 @@ use OC\AppFramework\Middleware\MiddlewareDispatcher; use OC\AppFramework\Middleware\Security\SecurityMiddleware; use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; +use OCP\AppFramework\IApi; +use OCP\AppFramework\IAppContainer; -class DIContainer extends SimpleContainer { +class DIContainer extends SimpleContainer implements IAppContainer{ /** @@ -45,6 +47,8 @@ class DIContainer extends SimpleContainer { $this['AppName'] = $appName; + $this->registerParameter('ServerContainer', \OC::$server); + $this['API'] = $this->share(function($c){ return new API($c['AppName']); }); @@ -119,4 +123,19 @@ class DIContainer extends SimpleContainer { } + /** + * @return IApi + */ + function getCoreApi() + { + return $this->query('API'); + } + + /** + * @return \OCP\Core\IServerContainer + */ + function getServer() + { + return $this->query('ServerContainer'); + } } diff --git a/lib/public/appframework/App.php b/lib/public/appframework/App.php new file mode 100644 index 00000000000..0c27fcb2ac5 --- /dev/null +++ b/lib/public/appframework/App.php @@ -0,0 +1,61 @@ +container = new \OC\AppFramework\DependencyInjection\DIContainer($appName); + } + + private $container; + + /** + * @return IAppContainer + */ + public function getContainer() { + return $this->container; + } + + /** + * This function is called by the routing component to fire up the frameworks dispatch mechanism. + * + * Example code in routes.php of the task app: + * $this->create('tasks_index', '/')->get()->action( + * function($params){ + * $app = new TaskApp(); + * $app->dispatch('PageController', 'index', $params); + * } + * ); + * + * + * Example for for TaskApp implementation: + * class TaskApp extends \OCP\AppFramework\App { + * + * public function __construct(){ + * parent::__construct('tasks'); + * + * $this->getContainer()->registerService('PageController', function(IAppContainer $c){ + * $a = $c->query('API'); + * $r = $c->query('Request'); + * return new PageController($a, $r); + * }); + * } + * } + * + * @param string $controllerName the name of the controller under which it is + * stored in the DI container + * @param string $methodName the method that you want to call + * @param array $urlParams an array with variables extracted from the routes + */ + public function dispatch($controllerName, $methodName, array $urlParams) { + \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container); + } +} diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php new file mode 100644 index 00000000000..5374f0dcaf5 --- /dev/null +++ b/lib/public/appframework/iapi.php @@ -0,0 +1,238 @@ +. + * + */ + + +namespace OCP\AppFramework; + + +/** + * A few very basic and frequently used API functions are combined in here + */ +interface IApi { + + /** + * used to return the appname of the set application + * @return string the name of your application + */ + function getAppName(); + + + /** + * Creates a new navigation entry + * @param array $entry containing: id, name, order, icon and href key + */ + function addNavigationEntry(array $entry); + + + /** + * Gets the userid of the current user + * @return string the user id of the current user + */ + function getUserId(); + + + /** + * Sets the current navigation entry to the currently running app + */ + function activateNavigationEntry(); + + + /** + * Adds a new javascript file + * @param string $scriptName the name of the javascript in js/ without the suffix + * @param string $appName the name of the app, defaults to the current one + */ + function addScript($scriptName, $appName = null); + + + /** + * Adds a new css file + * @param string $styleName the name of the css file in css/without the suffix + * @param string $appName the name of the app, defaults to the current one + */ + function addStyle($styleName, $appName = null); + + + /** + * shorthand for addScript for files in the 3rdparty directory + * @param string $name the name of the file without the suffix + */ + function add3rdPartyScript($name); + + + /** + * shorthand for addStyle for files in the 3rdparty directory + * @param string $name the name of the file without the suffix + */ + function add3rdPartyStyle($name); + + /** + * Looks up a system-wide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + function getSystemValue($key); + + /** + * Sets a new system-wide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + function setSystemValue($key, $value); + + + /** + * Looks up an app-specific defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + function getAppValue($key, $appName = null); + + + /** + * Writes a new app-specific value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + function setAppValue($key, $value, $appName = null); + + + /** + * Shortcut for setting a user defined value + * @param string $key the key under which the value is being stored + * @param string $value the value that you want to store + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + function setUserValue($key, $value, $userId = null); + + + /** + * Shortcut for getting a user defined value + * @param string $key the key under which the value is being stored + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + function getUserValue($key, $userId = null); + + /** + * Returns the translation object + * @return \OC_L10N the translation object + * + * FIXME: returns private object / should be retrieved from teh ServerContainer + */ + function getTrans(); + + + /** + * Used to abstract the owncloud database access away + * @param string $sql the sql query with ? placeholder for params + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \OCP\DB a query object + * + * FIXME: returns non public interface / object + */ + function prepareQuery($sql, $limit=null, $offset=null); + + + /** + * Used to get the id of the just inserted element + * @param string $tableName the name of the table where we inserted the item + * @return int the id of the inserted element + * + * FIXME: move to db object + */ + function getInsertId($tableName); + + + /** + * Returns the URL for a route + * @param string $routeName the name of the route + * @param array $arguments an array with arguments which will be filled into the url + * @return string the url + */ + function linkToRoute($routeName, $arguments=array()); + + + /** + * Returns an URL for an image or file + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + */ + function linkTo($file, $appName=null); + + + /** + * Returns the link to an image, like link to but only with prepending img/ + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + */ + function imagePath($file, $appName = null); + + + /** + * Makes an URL absolute + * @param string $url the url + * @return string the absolute url + * + * FIXME: function should live in Request / Response + */ + function getAbsoluteURL($url); + + + /** + * links to a file + * @param string $file the name of the file + * @param string $appName the name of the app, defaults to the current one + * @deprecated replaced with linkToRoute() + * @return string the url + */ + function linkToAbsolute($file, $appName = null); + + + /** + * Checks if an app is enabled + * @param string $appName the name of an app + * @return bool true if app is enabled + */ + public function isAppEnabled($appName); + + + /** + * Writes a function into the error log + * @param string $msg the error message to be logged + * @param int $level the error level + * + * FIXME: add logger instance to ServerContainer + */ + function log($msg, $level = null); + + + /** + * Returns a template + * @param string $templateName the name of the template + * @param string $renderAs how it should be rendered + * @param string $appName the name of the app + * @return \OCP\Template a new template + */ + function getTemplate($templateName, $renderAs='user', $appName=null); +} diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php new file mode 100644 index 00000000000..c2faea07b95 --- /dev/null +++ b/lib/public/appframework/iappcontainer.php @@ -0,0 +1,25 @@ + Date: Thu, 22 Aug 2013 01:20:28 +0200 Subject: fixing typos --- lib/util.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index dbda3ac0ad0..dacfd5b56fb 100755 --- a/lib/util.php +++ b/lib/util.php @@ -228,7 +228,7 @@ class OC_Util { $webServerRestart = true; } - //common hint for all file permissons error messages + //common hint for all file permissions error messages $permissionsHint = 'Permissions can usually be fixed by ' .'giving the webserver write access to the root directory.'; @@ -560,9 +560,9 @@ class OC_Util { * @see OC_Util::callRegister() * @see OC_Util::isCallRegistered() * @description - * Also required for the client side to compute the piont in time when to + * Also required for the client side to compute the point in time when to * request a fresh token. The client will do so when nearly 97% of the - * timespan coded here has expired. + * time span coded here has expired. */ public static $callLifespan = 3600; // 3600 secs = 1 hour @@ -640,14 +640,15 @@ class OC_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 sanitized string, depends on the input parameter. */ public static function sanitizeHTML( &$value ) { if (is_array($value)) { array_walk_recursive($value, 'OC_Util::sanitizeHTML'); } else { - $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4 + //Specify encoding for PHP<5.4 + $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); } return $value; } @@ -756,7 +757,7 @@ class OC_Util { } /** - * Check if the setlocal call doesn't work. This can happen if the right + * Check if the setlocal call does not work. This can happen if the right * local packages are not available on the server. * @return bool */ @@ -828,8 +829,8 @@ class OC_Util { /** - * @brief Generates a cryptographical secure pseudorandom string - * @param Int with the length of the random string + * @brief Generates a cryptographic secure pseudo-random string + * @param Int $length of the random string * @return String * Please also update secureRNGAvailable if you change something here */ @@ -970,7 +971,7 @@ class OC_Util { /** * @brief Clear the opcode cache if one exists * This is necessary for writing to the config file - * in case the opcode cache doesn't revalidate files + * in case the opcode cache does not re-validate files * @return void */ public static function clearOpcodeCache() { -- cgit v1.2.3 From 8dd93c8c0288a11f04816bea2a58aee661ef9e97 Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 23 Aug 2013 07:30:42 +0200 Subject: Fix some phpdoc and camelcase --- lib/util.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index dacfd5b56fb..f343e783206 100755 --- a/lib/util.php +++ b/lib/util.php @@ -16,7 +16,7 @@ class OC_Util { /** * @brief Can be set up - * @param user string + * @param string $user * @return boolean * @description configure the initial filesystem based on the configuration */ @@ -51,7 +51,8 @@ class OC_Util { self::$rootMounted = true; } - if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem + //if we aren't logged in, there is no use to set up the filesystem + if( $user != "" ) { $quota = self::getUserQuota($user); if ($quota !== \OC\Files\SPACE_UNLIMITED) { \OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) { @@ -131,7 +132,7 @@ class OC_Util { /** * @brief add a javascript file * - * @param appid $application + * @param string $application * @param filename $file * @return void */ @@ -150,7 +151,7 @@ class OC_Util { /** * @brief add a css file * - * @param appid $application + * @param string $application * @param filename $file * @return void */ @@ -168,7 +169,7 @@ class OC_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 * @return void @@ -184,8 +185,8 @@ class OC_Util { /** * @brief formats a timestamp in the "right" way * - * @param int timestamp $timestamp - * @param bool dateOnly option to omit time from the result + * @param int $timestamp + * @param bool $dateOnly option to omit time from the result * @return string timestamp * @description adjust to clients timezone if we know it */ @@ -418,12 +419,13 @@ class OC_Util { } /** - * Check for correct file permissions of data directory - * @return array arrays with error messages and hints - */ + * @brief Check for correct file permissions of data directory + * @paran string $dataDirectory + * @return array arrays with error messages and hints + */ public static function checkDataDirectoryPermissions($dataDirectory) { $errors = array(); - if (stristr(PHP_OS, 'WIN')) { + if (self::runningOnWindows()) { //TODO: permissions checks for windows hosts } else { $permissionsModHint = 'Please change the permissions to 0770 so that the directory' @@ -681,9 +683,9 @@ class OC_Util { $testContent = 'testcontent'; // creating a test file - $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename; + $testFile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$fileName; - if(file_exists($testfile)) {// already running this test, possible recursive call + if(file_exists($testFile)) {// already running this test, possible recursive call return false; } @@ -692,7 +694,7 @@ class OC_Util { @fclose($fp); // accessing the file via http - $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename); + $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$fileName); $fp = @fopen($url, 'r'); $content=@fread($fp, 2048); @fclose($fp); @@ -701,7 +703,7 @@ class OC_Util { @unlink($testfile); // does it work ? - if($content==$testcontent) { + if($content==$testContent) { return false; } else { return true; -- cgit v1.2.3 From 1dab0767502013b5e86e8e24e3b12a2a8939f7a8 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 23 Aug 2013 23:05:44 +0200 Subject: make it possible to disable previews --- config/config.sample.php | 1 + lib/preview.php | 10 ++++++++++ 2 files changed, 11 insertions(+) (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 5c40078c7d7..76de97818d5 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -191,6 +191,7 @@ $CONFIG = array( 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 // PREVIEW +'disable_previews' => false, /* the max width of a generated preview, if value is null, there is no limit */ 'preview_max_x' => null, /* the max height of a generated preview, if value is null, there is no limit */ diff --git a/lib/preview.php b/lib/preview.php index 9fed7f1b58f..0497ec95bc5 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -568,6 +568,12 @@ class Preview { * @return void */ private static function initProviders() { + if(\OC_Config::getValue('disable_previews', false)) { + $provider = new Preview\Unknown(); + self::$providers = array($provider); + return; + } + if(count(self::$providers)>0) { return; } @@ -599,6 +605,10 @@ class Preview { } public static function isMimeSupported($mimetype) { + if(\OC_Config::getValue('disable_previews', false)) { + return false; + } + //check if there are preview backends if(empty(self::$providers)) { self::initProviders(); -- cgit v1.2.3 From 58c727a4955b9ab60fa3c31fe902b673e883d181 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 23 Aug 2013 23:27:36 +0200 Subject: fix return value of method --- lib/preview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 0497ec95bc5..a8a8580e229 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -444,7 +444,8 @@ class Preview { * @return void */ public function show() { - return $this->showPreview(); + $this->showPreview(); + return; } /** -- cgit v1.2.3 From 4a08f7d710ced1c564e05471e1f873ecfb9ca161 Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 26 Jul 2013 12:20:11 +0200 Subject: Add basic avatars and gravatar --- config/config.sample.php | 6 ++++ core/img/defaultavatar.png | Bin 0 -> 12444 bytes core/templates/layout.user.php | 1 + lib/avatar.php | 59 ++++++++++++++++++++++++++++++++++++++++ lib/public/avatar.php | 15 ++++++++++ lib/templatelayout.php | 5 ++++ settings/admin.php | 1 + settings/ajax/setavatarmode.php | 12 ++++++++ settings/js/admin.js | 6 ++++ settings/personal.php | 1 + settings/routes.php | 2 ++ settings/templates/admin.php | 37 +++++++++++++++++++++++++ settings/templates/personal.php | 13 +++++++++ 13 files changed, 158 insertions(+) create mode 100644 core/img/defaultavatar.png create mode 100644 lib/avatar.php create mode 100644 lib/public/avatar.php create mode 100644 settings/ajax/setavatarmode.php (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 24ba541ac5c..fb2271339b2 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -65,6 +65,12 @@ $CONFIG = array( /* URL to the parent directory of the 3rdparty directory, as seen by the browser */ "3rdpartyurl" => "", +/* What avatars to use. + * May be "none" for none, "local" for uploaded avatars, or "gravatar" for gravatars. + * Default is "local". + */ +"avatars" => "local", + /* Default app to load on login */ "defaultapp" => "files", diff --git a/core/img/defaultavatar.png b/core/img/defaultavatar.png new file mode 100644 index 00000000000..e9572080bbf Binary files /dev/null and b/core/img/defaultavatar.png differ diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 3c1114492cb..038264bd064 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -47,6 +47,7 @@
    + diff --git a/lib/avatar.php b/lib/avatar.php new file mode 100644 index 00000000000..2b087c48b65 --- /dev/null +++ b/lib/avatar.php @@ -0,0 +1,59 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class OC_Avatar { + /** + * @brief gets the users avatar + * @param $user string username + * @param $size integer size in px of the avatar, defaults to 64 + * @return mixed link to the avatar, false if avatars are disabled + */ + public static function get ($user, $size = 64) { + $mode = OC_Config::getValue("avatar", "local"); + if ($mode === "none") { + // avatars are disabled + return false; + } elseif ($mode === "gravatar") { + $email = OC_Preferences::getValue($user, 'settings', 'email'); + if ($email !== null) { + $emailhash = md5(strtolower(trim($email))); + $url = "http://www.gravatar.com/avatar/".$emailhash."?s=".$size; + return $url; + } else { + return \OC_Avatar::getDefaultAvatar($size); + } + } elseif ($mode === "local") { + if (false) { + // + } else { + return \OC_Avatar::getDefaultAvatar($size); + } + } + } + + + /** + * @brief sets the users local avatar + * @param $user string user to set the avatar for + * @param $path string path where the avatar is + * @return true on success + */ + public static function setLocalAvatar ($user, $path) { + if (OC_Config::getValue("avatar", "local") === "local") { + // + } + } + + /** + * @brief gets the default avatar + * @return link to the default avatar + */ + public static function getDefaultAvatar ($size) { + return OC_Helper::imagePath("core", "defaultavatar.png"); + } +} diff --git a/lib/public/avatar.php b/lib/public/avatar.php new file mode 100644 index 00000000000..65356b8a710 --- /dev/null +++ b/lib/public/avatar.php @@ -0,0 +1,15 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP; + +class Avatar { + public static function get ($user, $size = 64) { + \OC_Avatar::get($user, $size); + } +} diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0024c9d4960..06cbacb692a 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -18,6 +18,11 @@ class OC_TemplateLayout extends OC_Template { $this->assign('bodyid', 'body-user'); } + // display avatars if they are enabled + if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar') === 'local') { + $this->assign('avatar', ''); + } + // Update notification if(OC_Config::getValue('updatechecker', true) === true) { $data=OC_Updater::check(); diff --git a/settings/admin.php b/settings/admin.php index 869729a9e41..394d6b55d78 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -30,6 +30,7 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); +$tmpl->assign('avatar', OC_Config::getValue("avatar", "local")); // Check if connected using HTTPS if (OC_Request::serverProtocol() === 'https') { diff --git a/settings/ajax/setavatarmode.php b/settings/ajax/setavatarmode.php new file mode 100644 index 00000000000..f6f19f50cc9 --- /dev/null +++ b/settings/ajax/setavatarmode.php @@ -0,0 +1,12 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +OC_Util::checkAdminUser(); +OCP\JSON::callCheck(); + +OC_Config::setValue('avatar', $_POST['mode']); diff --git a/settings/js/admin.js b/settings/js/admin.js index f2d6f37a51a..6fa1c768ea3 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -14,6 +14,12 @@ $(document).ready(function(){ } }); + $('#avatar input').change(function(){ + if ($(this).attr('checked')) { + $.post(OC.filePath('settings', 'ajax', 'setavatarmode.php'), {mode: $(this).val()}); + } + }); + $('#shareAPIEnabled').change(function() { $('.shareAPI td:not(#enable)').toggle(); }); diff --git a/settings/personal.php b/settings/personal.php index e69898f6f8f..4bec21d58c8 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -84,6 +84,7 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User: $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); $tmpl->assign('enableDecryptAll' , $enableDecryptAll); +$tmpl->assign('avatar', OC_Config::getValue('avatar', 'local')); $forms=OC_App::getForms('personal'); $tmpl->assign('forms', array()); diff --git a/settings/routes.php b/settings/routes.php index 73ee70d1d5c..9a27c3e439b 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -70,3 +70,5 @@ $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); $this->create('isadmin', '/settings/js/isadmin.js') ->actionInclude('settings/js/isadmin.php'); +$this->create('settings_ajax_setavatarmode', '/settings/ajax/setavatarmode.php') + ->actionInclude('settings/ajax/setavatarmode.php'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index e54586b80df..a166aec7775 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -116,6 +116,43 @@ if (!$_['internetconnectionworking']) {

    +
    + t('Avatars')); ?> + + + + + + + + + + +
    + > +
    + t('Use gravatar for avatars')); ?>
    + t('This sends data to gravatar')); ?> +
    + > +
    + t('Use local avatars, which each user has to upload themselves')); ?> +
    + > +
    + t('Do not provide avatars')); ?> +
    +
    +
    t('Sharing'));?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index bad88142da9..55f626aa574 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -74,12 +74,25 @@ if($_['passwordChangeSupported']) {
    t('Fill in an email address to enable password recovery'));?> + t('
    Your Email will be used for your gravatar')); + } ?> + +
    +
    + t('Avatar')); ?> +
    + +
    + + +
    t('Language'));?> -- cgit v1.2.3 From fac671b14ed06233d37ad38194ebf9a99118644a Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 29 Jul 2013 11:34:38 +0200 Subject: Modularize get(), async getAvatar, avatars @ usermgmt And other small improvements --- core/ajax/getavatar.php | 14 +++++ core/css/styles.css | 1 + core/routes.php | 3 ++ lib/avatar.php | 113 ++++++++++++++++++++++++++++++++-------- lib/installer.php | 1 + lib/public/avatar.php | 4 ++ lib/templatelayout.php | 2 +- settings/ajax/newavatar.php | 30 +++++++++++ settings/js/personal.js | 24 +++++++++ settings/routes.php | 2 + settings/templates/admin.php | 3 ++ settings/templates/personal.php | 7 ++- settings/templates/users.php | 6 +++ settings/users.php | 1 + 14 files changed, 187 insertions(+), 24 deletions(-) create mode 100644 core/ajax/getavatar.php create mode 100644 settings/ajax/newavatar.php (limited to 'lib') diff --git a/core/ajax/getavatar.php b/core/ajax/getavatar.php new file mode 100644 index 00000000000..66bab0230a6 --- /dev/null +++ b/core/ajax/getavatar.php @@ -0,0 +1,14 @@ + \OC_Avatar::get($_POST['user'], $_POST['size']))); + } else { + OC_JSON::success(array('data' => \OC_Avatar::get($_POST['user']))); + } +} else { + OC_JSON::error(); +} diff --git a/core/css/styles.css b/core/css/styles.css index 1e7098d16a2..367f3f7ca41 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -592,6 +592,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } .hidden { display:none; } .bold { font-weight:bold; } .center { text-align:center; } +.inlineblock { display: inline-block; } #notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;} #notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } diff --git a/core/routes.php b/core/routes.php index dd8222d4378..309ed7484d9 100644 --- a/core/routes.php +++ b/core/routes.php @@ -36,6 +36,9 @@ $this->create('core_ajax_vcategories_favorites', '/core/ajax/vcategories/favorit ->actionInclude('core/ajax/vcategories/favorites.php'); $this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php') ->actionInclude('core/ajax/vcategories/edit.php'); +// Avatars +$this->create('core_ajax_getavatar', '/core/ajax/getavatar.php') + ->actionInclude('core/ajax/getavatar.php'); // oC JS config $this->create('js_config', '/core/js/config.js') ->actionInclude('core/js/config.php'); diff --git a/lib/avatar.php b/lib/avatar.php index 2b087c48b65..b232e9be762 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -6,9 +6,15 @@ * See the COPYING-README file. */ +/** + * This class gets and sets users avatars. + * Avalaible backends are local (saved in users root at avatar.[png|jpg]) and gravatar. + * However the get function is easy to extend with further backends. +*/ + class OC_Avatar { /** - * @brief gets the users avatar + * @brief gets a link to the users avatar * @param $user string username * @param $size integer size in px of the avatar, defaults to 64 * @return mixed link to the avatar, false if avatars are disabled @@ -19,41 +25,106 @@ class OC_Avatar { // avatars are disabled return false; } elseif ($mode === "gravatar") { - $email = OC_Preferences::getValue($user, 'settings', 'email'); - if ($email !== null) { - $emailhash = md5(strtolower(trim($email))); - $url = "http://www.gravatar.com/avatar/".$emailhash."?s=".$size; - return $url; - } else { - return \OC_Avatar::getDefaultAvatar($size); - } + return \OC_Avatar::getGravatar($user, $size); } elseif ($mode === "local") { - if (false) { - // - } else { - return \OC_Avatar::getDefaultAvatar($size); - } + return \OC_Avatar::getLocalAvatar($user, $size); } } + /** + * @brief returns the active avatar mode + * @return string active avatar mode + */ + public static function getMode () { + return OC_Config::getValue("avatar", "local"); + } /** * @brief sets the users local avatar * @param $user string user to set the avatar for - * @param $path string path where the avatar is + * @param $img mixed imagedata to set a new avatar, or false to delete the current avatar + * @param $type string fileextension + * @throws Exception if the provided image is not valid, or not a square * @return true on success */ - public static function setLocalAvatar ($user, $path) { - if (OC_Config::getValue("avatar", "local") === "local") { - // + public static function setLocalAvatar ($user, $img, $type) { + $view = new \OC\Files\View('/'.$user); + + if ($img === false) { + $view->unlink('avatar.jpg'); + $view->unlink('avatar.png'); + return true; + } else { + $img = new OC_Image($img); + + if (!( $img->valid() && ($img->height() === $img->width()) )) { + throw new Exception(); + } + + $view->unlink('avatar.jpg'); + $view->unlink('avatar.png'); + $view->file_put_contents('avatar.'.$type, $img); + return true; + } + } + + /** + * @brief get the users gravatar + * @param $user string which user to get the gravatar for + * @param size integer size in px of the avatar, defaults to 64 + * @return string link to the gravatar, or base64encoded, html-ready image + */ + public static function getGravatar ($user, $size = 64) { + $email = OC_Preferences::getValue($user, 'settings', 'email'); + if ($email !== null) { + $emailhash = md5(strtolower(trim($email))); + $url = "http://www.gravatar.com/avatar/".$emailhash."?s=".$size; + return $url; + } else { + return \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar($size), 'png'); + } + } + + /** + * @brief get the local avatar + * @param $user string which user to get the avatar for + * @param $size integer size in px of the avatar, defaults to 64 + * @return string base64encoded encoded, html-ready image + */ + public static function getLocalAvatar ($user, $size = 64) { + $view = new \OC\Files\View('/'.$user); + + if ($view->file_exists('avatar.jpg')) { + $type = 'jpg'; + } elseif ($view->file_exists('avatar.png')) { + $type = 'png'; + } else { + return \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar($size), 'png'); } + + $avatar = new OC_Image($view->file_get_contents('avatar.'.$type)); + $avatar->resize($size); + return \OC_Avatar::wrapIntoImg((string)$avatar, $type); } /** * @brief gets the default avatar - * @return link to the default avatar + * @param $size integer size of the avatar in px, defaults to 64 + * @return string base64 encoded default avatar + */ + public static function getDefaultAvatar ($size = 64) { + $default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); + $default->resize($size); + return (string)$default; + } + + /** + * @brief wrap a base64encoded image, so it can be used in html + * @param $img string base64encoded image + * @param $type string imagetype + * @return string wrapped image */ - public static function getDefaultAvatar ($size) { - return OC_Helper::imagePath("core", "defaultavatar.png"); + public static function wrapIntoImg($img, $type) { + return 'data:image/'.$type.';base64,'.$img; } } diff --git a/lib/installer.php b/lib/installer.php index b9684eaeea0..179b279c5b4 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -426,6 +426,7 @@ class OC_Installer{ 'OC_API::', 'OC_App::', 'OC_AppConfig::', + 'OC_Avatar::', 'OC_BackgroundJob::', 'OC_Config::', 'OC_DB::', diff --git a/lib/public/avatar.php b/lib/public/avatar.php index 65356b8a710..5d432f07cce 100644 --- a/lib/public/avatar.php +++ b/lib/public/avatar.php @@ -12,4 +12,8 @@ class Avatar { public static function get ($user, $size = 64) { \OC_Avatar::get($user, $size); } + + public static function getMode () { + \OC_Avatar::getMode(); + } } diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 06cbacb692a..f24cd9cfd9e 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -19,7 +19,7 @@ class OC_TemplateLayout extends OC_Template { } // display avatars if they are enabled - if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar') === 'local') { + if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar', 'local') === 'local') { $this->assign('avatar', ''); } diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php new file mode 100644 index 00000000000..b52317c9678 --- /dev/null +++ b/settings/ajax/newavatar.php @@ -0,0 +1,30 @@ +file_get_contents($path); + + $type = substr($path, -3); + if ($type === 'peg') { $type = 'jpg'; } + + if ($type === 'jpg' or $type === 'png') { + \OC_Avatar::setLocalAvatar($user, $img, $type); + OC_JSON::success(); + } else { + OC_JSON::error(); + } + } +} elseif (isset($_POST['image'])) { // upload a new image + \OC_Avatar::setLocalAvatar($user, $_POST['image']); + OC_JSON::success(); +} else { + OC_JSON::error(); +} diff --git a/settings/js/personal.js b/settings/js/personal.js index 8ad26c086b5..fdaca07e98d 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -44,6 +44,17 @@ function changeDisplayName(){ } } +function selectAvatar (path) { + $.post(OC.filePath('settings', 'ajax', 'newavatar.php'), {path: path}); + updateAvatar(); +} + +function updateAvatar () { + $.post(OC.filePath('core', 'ajax', 'getavatar.php'), {user: OC.currentUser, size: 128}, function(data){ + $('#avatar img').attr('src', data.data); + }); +} + $(document).ready(function(){ $("#passwordbutton").click( function(){ if ($('#pass1').val() !== '' && $('#pass2').val() !== '') { @@ -128,6 +139,19 @@ $(document).ready(function(){ } }); + $('#uploadavatar').click(function(){ + alert('To be done'); + updateAvatar(); + }); + + $('#selectavatar').click(function(){ + OC.dialogs.filepicker(t('settings', "Select an avatar"), selectAvatar, false, "image"); + }); + + $('#removeavatar').click(function(){ + $.post(OC.filePath('settings', 'ajax', 'newavatar.php'), {path: false}); + updateAvatar(); + }); } ); OC.Encryption = { diff --git a/settings/routes.php b/settings/routes.php index 9a27c3e439b..7d323008419 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -72,3 +72,5 @@ $this->create('isadmin', '/settings/js/isadmin.js') ->actionInclude('settings/js/isadmin.php'); $this->create('settings_ajax_setavatarmode', '/settings/ajax/setavatarmode.php') ->actionInclude('settings/ajax/setavatarmode.php'); +$this->create('settings_ajax_newavatar', '/settings/ajax/newavatar.php') + ->actionInclude('settings/ajax/newavatar.php'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a166aec7775..e5b941f2b2f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -128,6 +128,9 @@ if (!$_['internetconnectionworking']) {
    t('Use gravatar for avatars')); ?>
    t('This sends data to gravatar')); ?> + +
    t('Gravatar needs an internet connection!')); ?> +
    diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 55f626aa574..01415a6f9a1 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -87,8 +87,11 @@ if($_['passwordChangeSupported']) {
    t('Avatar')); ?> -
    - +
    + t('Your avatar has to be a square and either a PNG or JPG image')); ?>
    +
    t('Upload a new avatar')); ?>
    +
    t('Select a new avatar from your files')); ?>
    +
    t('Remove my avatar')); ?>
    diff --git a/settings/templates/users.php b/settings/templates/users.php index 22450fdf25f..81d9a46d89d 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -81,6 +81,9 @@ $_['subadmingroups'] = array_flip($items);
    + + + @@ -96,6 +99,9 @@ $_['subadmingroups'] = array_flip($items); " data-displayName=""> + + + - + -- cgit v1.2.3 From 4a9c89fb3323e26fb88559e658136af4bbc7a3c8 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 18 Aug 2013 16:41:00 +0200 Subject: Clean up and prepare a bit for custom default avatars --- avatar.php | 6 +----- lib/avatar.php | 13 ++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/avatar.php b/avatar.php index f983f62f8b1..dee162eca7f 100644 --- a/avatar.php +++ b/avatar.php @@ -1,9 +1,5 @@ show(); } diff --git a/lib/avatar.php b/lib/avatar.php index f503d01304d..b091161aef0 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -8,7 +8,7 @@ /** * This class gets and sets users avatars. - * Avalaible backends are local (saved in users root at avatar.[png|jpg]) and gravatar. + * Available backends are local (saved in users root at avatar.[png|jpg]), gravatar TODO and custom backends. * However the get function is easy to extend with further backends. */ @@ -84,9 +84,8 @@ class OC_Avatar { /** * @brief get the users gravatar * @param $user string which user to get the gravatar for - * @param size integer size in px of the avatar, defaults to 64 + * @param $size integer size in px of the avatar, defaults to 64 * @return string link to the gravatar, or \OC_Image with the default avatar - * @todo work on hashing userstrings, so one can't guess usernames */ public static function getGravatar ($user, $size = 64) { $email = \OC_Preferences::getValue($user, 'settings', 'email'); @@ -98,7 +97,7 @@ class OC_Avatar { return $url; } } - return self::getDefaultAvatar($size); + return self::getDefaultAvatar($user, $size); } /** @@ -115,7 +114,7 @@ class OC_Avatar { } elseif ($view->file_exists('avatar.png')) { $ext = 'png'; } else { - return self::getDefaultAvatar($size); + return self::getDefaultAvatar($user, $size); } $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); @@ -132,12 +131,12 @@ class OC_Avatar { /** * @brief gets the default avatar - * @todo when custom default images arive @param $user string which user to get the avatar for + * @brief $user string which user to get the avatar for * @param $size integer size of the avatar in px, defaults to 64 * @return \OC_Image containing the default avatar * @todo use custom default images, when they arive */ - public static function getDefaultAvatar ($size = 64) { + public static function getDefaultAvatar ($user, $size = 64) { $default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); $default->resize($size); return $default; -- cgit v1.2.3 From 81cadd5ea37f1db30cdd085dc58a27ef8a9ee5c2 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 19 Aug 2013 12:15:48 +0200 Subject: Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff --- avatar.php | 11 +--- config/config.sample.php | 6 --- core/img/defaultavatar.png | Bin 12444 -> 0 bytes lib/avatar.php | 114 +++++++++++----------------------------- settings/admin.php | 1 - settings/ajax/setavatarmode.php | 12 ----- settings/js/admin.js | 6 --- settings/personal.php | 4 +- settings/routes.php | 2 - settings/templates/admin.php | 27 ---------- settings/templates/personal.php | 19 ++----- settings/templates/users.php | 8 +-- tests/lib/avatar.php | 38 ++------------ 13 files changed, 45 insertions(+), 203 deletions(-) delete mode 100644 core/img/defaultavatar.png delete mode 100644 settings/ajax/setavatarmode.php (limited to 'lib') diff --git a/avatar.php b/avatar.php index a6d6666c623..70444dafcb5 100644 --- a/avatar.php +++ b/avatar.php @@ -7,11 +7,6 @@ if (!\OC_User::isLoggedIn()) { \OC_Template::printErrorPage("Permission denied"); } -$mode = \OC_Avatar::getMode(); -if ($mode === "none") { - exit(); -} - if ($_SERVER['REQUEST_METHOD'] === "GET") { if (isset($_GET['user'])) { //SECURITY TODO does this fully eliminate directory traversals? @@ -33,8 +28,6 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { if ($image instanceof \OC_Image) { $image->show(); - } elseif (is_string($image)) { // Gravatar alike services - header("Location: ".$image); } else { $image = \OC_Avatar::getDefaultAvatar($user, $size); $image->show(); @@ -60,7 +53,7 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { } try { - \OC_Avatar::setLocalAvatar($user, $avatar); + \OC_Avatar::set($user, $avatar); OC_JSON::success(); } catch (\Exception $e) { OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); @@ -69,7 +62,7 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { $user = OC_User::getUser(); try { - \OC_Avatar::setLocalAvatar($user, false); + \OC_Avatar::set($user, false); OC_JSON::success(); } catch (\Exception $e) { OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); diff --git a/config/config.sample.php b/config/config.sample.php index fb2271339b2..24ba541ac5c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -65,12 +65,6 @@ $CONFIG = array( /* URL to the parent directory of the 3rdparty directory, as seen by the browser */ "3rdpartyurl" => "", -/* What avatars to use. - * May be "none" for none, "local" for uploaded avatars, or "gravatar" for gravatars. - * Default is "local". - */ -"avatars" => "local", - /* Default app to load on login */ "defaultapp" => "files", diff --git a/core/img/defaultavatar.png b/core/img/defaultavatar.png deleted file mode 100644 index e9572080bbf..00000000000 Binary files a/core/img/defaultavatar.png and /dev/null differ diff --git a/lib/avatar.php b/lib/avatar.php index b091161aef0..fa8fece080c 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -8,52 +8,44 @@ /** * This class gets and sets users avatars. - * Available backends are local (saved in users root at avatar.[png|jpg]), gravatar TODO and custom backends. - * However the get function is easy to extend with further backends. -*/ + */ class OC_Avatar { /** - * @brief gets the users avatar - * @param $user string username, if not provided, the default avatar will be returned - * @param $size integer size in px of the avatar, defaults to 64 - * @return mixed \OC_Image containing the avatar, a link to the avatar, false if avatars are disabled - */ - public static function get ($user = false, $size = 64) { - $mode = self::getMode(); - if ($mode === "none") { - // avatars are disabled - return false; - } else { - if ($user === false) { - return self::getDefaultAvatar($size); - } elseif ($mode === "gravatar") { - return self::getGravatar($user, $size); - } elseif ($mode === "local") { - return self::getLocalAvatar($user, $size); - } elseif ($mode === "custom") { - return self::getCustomAvatar($user, $size); - } + * @brief get the users avatar + * @param $user string which user to get the avatar for + * @param $size integer size in px of the avatar, defaults to 64 + * @return \OC_Image containing the avatar + */ + public static function get ($user, $size = 64) { + if ($user === false) { + return self::getDefaultAvatar($user, $size); } - } - /** - * @brief returns the active avatar mode - * @return string active avatar mode - */ - public static function getMode () { - return \OC_Config::getValue("avatar", "local"); - } + $view = new \OC\Files\View('/'.$user); + + if ($view->file_exists('avatar.jpg')) { + $ext = 'jpg'; + } elseif ($view->file_exists('avatar.png')) { + $ext = 'png'; + } else { + return self::getDefaultAvatar($user, $size); + } + + $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); + $avatar->resize($size); + return $avatar; + } /** - * @brief sets the users local avatar + * @brief sets the users avatar * @param $user string user to set the avatar for * @param $data mixed imagedata or path to set a new avatar, or false to delete the current avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid, or not a square * @return true on success */ - public static function setLocalAvatar ($user, $data) { + public static function set ($user, $data) { $view = new \OC\Files\View('/'.$user); if ($data === false) { @@ -66,7 +58,7 @@ class OC_Avatar { if ($type === 'peg') { $type = 'jpg'; } if ($type !== 'jpg' && $type !== 'png') { $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Unknown filetype for avatar")); + throw new \Exception($l->t("Unknown filetype")); } if (!( $img->valid() && ($img->height() === $img->width()) )) { @@ -81,54 +73,6 @@ class OC_Avatar { } } - /** - * @brief get the users gravatar - * @param $user string which user to get the gravatar for - * @param $size integer size in px of the avatar, defaults to 64 - * @return string link to the gravatar, or \OC_Image with the default avatar - */ - public static function getGravatar ($user, $size = 64) { - $email = \OC_Preferences::getValue($user, 'settings', 'email'); - if ($email !== null) { - $emailhash = md5(strtolower(trim($email))); - $url = "http://secure.gravatar.com/avatar/".$emailhash."?d=404&s=".$size; - $headers = get_headers($url, 1); - if (strpos($headers[0], "404 Not Found") === false) { - return $url; - } - } - return self::getDefaultAvatar($user, $size); - } - - /** - * @brief get the local avatar - * @param $user string which user to get the avatar for - * @param $size integer size in px of the avatar, defaults to 64 - * @return string \OC_Image containing the avatar - */ - public static function getLocalAvatar ($user, $size = 64) { - $view = new \OC\Files\View('/'.$user); - - if ($view->file_exists('avatar.jpg')) { - $ext = 'jpg'; - } elseif ($view->file_exists('avatar.png')) { - $ext = 'png'; - } else { - return self::getDefaultAvatar($user, $size); - } - - $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); - $avatar->resize($size); - return $avatar; - } - - /** - * @todo todo - */ - public static function getCustomAvatar($user, $size) { - // TODO - } - /** * @brief gets the default avatar * @brief $user string which user to get the avatar for @@ -137,8 +81,10 @@ class OC_Avatar { * @todo use custom default images, when they arive */ public static function getDefaultAvatar ($user, $size = 64) { - $default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); + // TODO + /*$default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); $default->resize($size); - return $default; + return $default;*/ + return; } } diff --git a/settings/admin.php b/settings/admin.php index 394d6b55d78..869729a9e41 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -30,7 +30,6 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); -$tmpl->assign('avatar', OC_Config::getValue("avatar", "local")); // Check if connected using HTTPS if (OC_Request::serverProtocol() === 'https') { diff --git a/settings/ajax/setavatarmode.php b/settings/ajax/setavatarmode.php deleted file mode 100644 index f6f19f50cc9..00000000000 --- a/settings/ajax/setavatarmode.php +++ /dev/null @@ -1,12 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -OC_Util::checkAdminUser(); -OCP\JSON::callCheck(); - -OC_Config::setValue('avatar', $_POST['mode']); diff --git a/settings/js/admin.js b/settings/js/admin.js index 6fa1c768ea3..f2d6f37a51a 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -14,12 +14,6 @@ $(document).ready(function(){ } }); - $('#avatar input').change(function(){ - if ($(this).attr('checked')) { - $.post(OC.filePath('settings', 'ajax', 'setavatarmode.php'), {mode: $(this).val()}); - } - }); - $('#shareAPIEnabled').change(function() { $('.shareAPI td:not(#enable)').toggle(); }); diff --git a/settings/personal.php b/settings/personal.php index 233b1440eb2..d109d33e4bd 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -15,9 +15,7 @@ OC_Util::addScript( 'settings', 'personal' ); OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); -if (OC_Config::getValue('avatar', 'local') === 'local') { - \OC_Util::addScript('files', 'jquery.fileupload'); -} +\OC_Util::addScript('files', 'jquery.fileupload'); OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo(); diff --git a/settings/routes.php b/settings/routes.php index 9a27c3e439b..73ee70d1d5c 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -70,5 +70,3 @@ $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); $this->create('isadmin', '/settings/js/isadmin.js') ->actionInclude('settings/js/isadmin.php'); -$this->create('settings_ajax_setavatarmode', '/settings/ajax/setavatarmode.php') - ->actionInclude('settings/ajax/setavatarmode.php'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 64c1b1112ce..e54586b80df 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -116,33 +116,6 @@ if (!$_['internetconnectionworking']) {

    -
    - t('Profile images')); ?> -

    - - > -
    - t('Use gravatar for profile images')); ?>
    - t('This sends data to gravatar and may slow down loading')); ?> - -
    t('Gravatar needs an internet connection!')); ?> - -

    -

    - > -
    - t('Use local avatars, which each user has to upload themselves')); ?> -

    -

    - > -
    - t('Do not provide avatars')); ?> -

    -
    -
    t('Sharing'));?>
    t('Avatar')); ?>t('Username'))?> t( 'Display Name' )); ?> t( 'Password' )); ?>
    "> $displayName) { $users[] = array( "name" => $uid, + "avatar" => \OC_Avatar::get($uid, 32), "displayName" => $displayName, "groups" => OC_Group::getUserGroups($uid), 'quota' => $quota, -- cgit v1.2.3 From 2bfe66223563b16a067be273e0d6979b420598ad Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 30 Jul 2013 16:09:54 +0200 Subject: Add unittests & check filetype in setLocalAvatar() TODO: Fix OC_Image->mimetype(), it always returns "image/png" --- lib/avatar.php | 10 ++++++-- settings/ajax/newavatar.php | 10 +++----- tests/data/testavatar.png | Bin 0 -> 3705 bytes tests/lib/avatar.php | 61 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 tests/data/testavatar.png create mode 100644 tests/lib/avatar.php (limited to 'lib') diff --git a/lib/avatar.php b/lib/avatar.php index b232e9be762..f3db07142ca 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -43,11 +43,11 @@ class OC_Avatar { * @brief sets the users local avatar * @param $user string user to set the avatar for * @param $img mixed imagedata to set a new avatar, or false to delete the current avatar - * @param $type string fileextension + * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid, or not a square * @return true on success */ - public static function setLocalAvatar ($user, $img, $type) { + public static function setLocalAvatar ($user, $img) { $view = new \OC\Files\View('/'.$user); if ($img === false) { @@ -56,6 +56,12 @@ class OC_Avatar { return true; } else { $img = new OC_Image($img); + // FIXME this always says "image/png" + $type = substr($img->mimeType(), -3); + if ($type === 'peg') { $type = 'jpg'; } + if ($type !== 'jpg' && $type !== 'png') { + throw new Exception(); + } if (!( $img->valid() && ($img->height() === $img->width()) )) { throw new Exception(); diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php index b52317c9678..456cd84e970 100644 --- a/settings/ajax/newavatar.php +++ b/settings/ajax/newavatar.php @@ -7,18 +7,16 @@ $user = OC_User::getUser(); if(isset($_POST['path'])) { $path = $_POST['path']; if ($path === "false") { // delete avatar - \OC_Avatar::setLocalAvatar($user, false, false); + \OC_Avatar::setLocalAvatar($user, false); } else { // select an image from own files $view = new \OC\Files\View('/'.$user.'/files'); $img = $view->file_get_contents($path); $type = substr($path, -3); - if ($type === 'peg') { $type = 'jpg'; } - - if ($type === 'jpg' or $type === 'png') { - \OC_Avatar::setLocalAvatar($user, $img, $type); + try { + \OC_Avatar::setLocalAvatar($user, $img); OC_JSON::success(); - } else { + } catch (Exception $e) { OC_JSON::error(); } } diff --git a/tests/data/testavatar.png b/tests/data/testavatar.png new file mode 100644 index 00000000000..24770fb634f Binary files /dev/null and b/tests/data/testavatar.png differ diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php new file mode 100644 index 00000000000..b1d9f46ed09 --- /dev/null +++ b/tests/lib/avatar.php @@ -0,0 +1,61 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_Avatar extends PHPUnit_Framework_TestCase { + + public function testModes() { + $this->assertEquals('local', \OC_Avatar::getMode()); + + \OC_Config::setValue('avatar', 'local'); + $this->assertEquals('local', \OC_Avatar::getMode()); + + \OC_Config::setValue('avatar', 'gravatar'); + $this->assertEquals('gravatar', \OC_Avatar::getMode()); + + \OC_Config::setValue('avatar', 'none'); + $this->assertEquals('none', \OC_Avatar::getMode()); + } + + public function testDisabledAvatar() { + \OC_Config::setValue('avatar', 'none'); + $this->assertFalse(\OC_Avatar::get(\OC_User::getUser())); + $this->assertFalse(\OC_Avatar::get(\OC_User::getUser(), 32)); + } + + public function testLocalAvatar() { + \OC_Config::setValue('avatar', 'local'); + $this->assertEquals(\OC_Avatar::get(\OC_User::getUser()), \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar(), 'png')); + + $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); + \OC_Avatar::setLocalAvatar(\OC_User::getUser(), $expected->data()); + $expected->resize(32); + $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())); + + \OC_Avatar::setLocalAvatar(\OC_User::getUser(), false); + $this->assertEquals(\OC_Avatar::get(\OC_User::getUser()), \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar(), 'png')); + } + + public function testGravatar() { + \OC_Preferences::setValue(\OC_User::getUser(), 'settings', 'email', 'someone@example.com'); + \OC_Config::setValue('avatar', 'gravatar'); + $expected = "http://www.gravatar.com/avatar/".md5("someone@example.com")."?s="; + $this->assertEquals($expected."64", \OC_Avatar::get(\OC_User::getUser())); + $this->assertEquals($expected."32", \OC_Avatar::get(\OC_User::getUser(), 32)); + } + + public function testDefaultAvatar() { + $img = new \OC_Image(OC::$SERVERROOT.'/core/img/defaultavatar.png'); + $img->resize(128); + $this->assertEquals((string)$img, \OC_Avatar::getDefaultAvatar(128)); + } + + public function testWrapIntoImg() { + $expected = "data:image/test;base64,DUMMY==123=="; + $this->assertEquals($expected, \OC_Avatar::wrapIntoImg("DUMMY==123==", "test")); + } +} -- cgit v1.2.3 From a58d270684110334aab1b296b69e98def6cc6558 Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 1 Aug 2013 17:13:11 +0200 Subject: Load avatar from path, if one's provided --- lib/avatar.php | 12 ++++++------ settings/ajax/newavatar.php | 10 +++------- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/avatar.php b/lib/avatar.php index f3db07142ca..dcaf81f0349 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -42,21 +42,21 @@ class OC_Avatar { /** * @brief sets the users local avatar * @param $user string user to set the avatar for - * @param $img mixed imagedata to set a new avatar, or false to delete the current avatar + * @param $data mixed imagedata or path to set a new avatar, or false to delete the current avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid, or not a square * @return true on success */ - public static function setLocalAvatar ($user, $img) { + public static function setLocalAvatar ($user, $data) { $view = new \OC\Files\View('/'.$user); - if ($img === false) { + if ($data === false) { $view->unlink('avatar.jpg'); $view->unlink('avatar.png'); return true; } else { - $img = new OC_Image($img); - // FIXME this always says "image/png" + $img = new OC_Image($data); + // FIXME this always says "image/png", when loading from data $type = substr($img->mimeType(), -3); if ($type === 'peg') { $type = 'jpg'; } if ($type !== 'jpg' && $type !== 'png') { @@ -69,7 +69,7 @@ class OC_Avatar { $view->unlink('avatar.jpg'); $view->unlink('avatar.png'); - $view->file_put_contents('avatar.'.$type, $img); + $view->file_put_contents('avatar.'.$type, $data); return true; } } diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php index 456cd84e970..4c8ff0c4169 100644 --- a/settings/ajax/newavatar.php +++ b/settings/ajax/newavatar.php @@ -5,16 +5,12 @@ OC_JSON::callCheck(); $user = OC_User::getUser(); if(isset($_POST['path'])) { - $path = $_POST['path']; - if ($path === "false") { // delete avatar + if ($_POST['path'] === "false") { // delete avatar \OC_Avatar::setLocalAvatar($user, false); } else { // select an image from own files - $view = new \OC\Files\View('/'.$user.'/files'); - $img = $view->file_get_contents($path); - - $type = substr($path, -3); try { - \OC_Avatar::setLocalAvatar($user, $img); + $path = OC::$SERVERROOT.'/data/'.$user.'/files'.$_POST['path']; + \OC_Avatar::setLocalAvatar($user, $path); OC_JSON::success(); } catch (Exception $e) { OC_JSON::error(); -- cgit v1.2.3 From 252548c62cf099e5186ffc323e3cf9494fae3768 Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 2 Aug 2013 08:03:51 +0200 Subject: Improve styling & enable avatar-upload at personal page --- core/css/styles.css | 5 +++++ core/templates/layout.user.php | 4 +++- lib/templatelayout.php | 2 +- settings/ajax/newavatar.php | 15 +++++++++++---- settings/css/settings.css | 3 +++ settings/js/personal.js | 8 ++++++++ settings/personal.php | 3 +++ settings/templates/admin.php | 21 ++++++++------------- settings/templates/personal.php | 2 +- tests/lib/avatar.php | 2 +- 10 files changed, 44 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/core/css/styles.css b/core/css/styles.css index 367f3f7ca41..792ccb08329 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -40,6 +40,11 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right { float:right; vertical-align:middle; padding:0.5em; } .header-right > * { vertical-align:middle; } +header .avatar { + float:right; + margin-top: 6px; + margin-right: 6px; +} /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 038264bd064..0ab6a4dc08b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -45,9 +45,11 @@ <?php p($theme->getName()); ?> + + +
      - diff --git a/lib/templatelayout.php b/lib/templatelayout.php index f24cd9cfd9e..c26dff4176c 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -20,7 +20,7 @@ class OC_TemplateLayout extends OC_Template { // display avatars if they are enabled if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar', 'local') === 'local') { - $this->assign('avatar', ''); + $this->assign('avatar', ''); } // Update notification diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php index 4c8ff0c4169..bede15e499d 100644 --- a/settings/ajax/newavatar.php +++ b/settings/ajax/newavatar.php @@ -13,12 +13,19 @@ if(isset($_POST['path'])) { \OC_Avatar::setLocalAvatar($user, $path); OC_JSON::success(); } catch (Exception $e) { - OC_JSON::error(); + OC_JSON::error(array("msg" => $e->getMessage())); } } -} elseif (isset($_POST['image'])) { // upload a new image - \OC_Avatar::setLocalAvatar($user, $_POST['image']); - OC_JSON::success(); +} elseif (!empty($_FILES)) { // upload a new image + $files = $_FILES['files']; + if ($files['error'][0] === 0) { + $data = file_get_contents($files['tmp_name'][0]); + \OC_Avatar::setLocalAvatar($user, $data); + unlink($files['tmp_name'][0]); + OC_JSON::success(); + } else { + OC_JSON::error(); + } } else { OC_JSON::error(); } diff --git a/settings/css/settings.css b/settings/css/settings.css index d5ffe448482..e6ced0e375a 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -35,6 +35,9 @@ td.name, td.password { padding-left:.8em; } td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidden; } td.password, td.quota, td.displayName { width:12em; cursor:pointer; } td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; } +td.avatar img { + margin-top: 6px; +} td.remove { width:1em; padding-right:1em; } tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; } diff --git a/settings/js/personal.js b/settings/js/personal.js index fdaca07e98d..71b4785bbf2 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -144,6 +144,14 @@ $(document).ready(function(){ updateAvatar(); }); + var uploadparms = { + done: function(e) { + updateAvatar(); + } + }; + + $('#uploadavatar').fileupload(uploadparms); + $('#selectavatar').click(function(){ OC.dialogs.filepicker(t('settings', "Select an avatar"), selectAvatar, false, "image"); }); diff --git a/settings/personal.php b/settings/personal.php index 4bec21d58c8..233b1440eb2 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -15,6 +15,9 @@ OC_Util::addScript( 'settings', 'personal' ); OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); +if (OC_Config::getValue('avatar', 'local') === 'local') { + \OC_Util::addScript('files', 'jquery.fileupload'); +} OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo(); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index e5b941f2b2f..f7d6a576d9e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -121,10 +121,9 @@ if (!$_['internetconnectionworking']) {
      - > + + >
      t('Use gravatar for avatars')); ?>
      t('This sends data to gravatar')); ?> @@ -135,22 +134,18 @@ if (!$_['internetconnectionworking']) {
      - > + >
      t('Use local avatars, which each user has to upload themselves')); ?>
      - > + >
      - t('Do not provide avatars')); ?> + t('Do not provide avatars')); ?>
      diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 01415a6f9a1..e0e91cb7de4 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -87,7 +87,7 @@ if($_['passwordChangeSupported']) {
      t('Avatar')); ?> -
      +
      t('Your avatar has to be a square and either a PNG or JPG image')); ?>
      t('Upload a new avatar')); ?>
      t('Select a new avatar from your files')); ?>
      diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index b1d9f46ed09..551e4e4ec46 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -13,7 +13,7 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { \OC_Config::setValue('avatar', 'local'); $this->assertEquals('local', \OC_Avatar::getMode()); - + \OC_Config::setValue('avatar', 'gravatar'); $this->assertEquals('gravatar', \OC_Avatar::getMode()); -- cgit v1.2.3 From 4521b54c672d4111ee578cb7049aca53c79a5eef Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 8 Aug 2013 17:03:19 +0200 Subject: Have /avatar.php as a central avatar-point --- avatar.php | 36 +++++++++++++++++++++ core/ajax/getavatar.php | 14 --------- core/routes.php | 3 -- lib/avatar.php | 70 +++++++++++++++++++++-------------------- settings/js/personal.js | 4 +-- settings/templates/personal.php | 4 +-- tests/lib/avatar.php | 17 +++++----- 7 files changed, 82 insertions(+), 66 deletions(-) create mode 100644 avatar.php delete mode 100644 core/ajax/getavatar.php (limited to 'lib') diff --git a/avatar.php b/avatar.php new file mode 100644 index 00000000000..1134dc2e710 --- /dev/null +++ b/avatar.php @@ -0,0 +1,36 @@ + 0)) { + $size = (int)$_GET['size']; + if ($size > 2048) { + $size = 2048; + } +} else { + $size = 64; +} + + +$image = \OC_Avatar::get($user, $size); + +if ($image instanceof \OC_Image) { + $image->show(); +} elseif (is_string($image)) { // Gravatar alike services + header("Location: ".$image); +} else { + $image = \OC_Avatar::getDefaultAvatar($size); + $image->show(); +} diff --git a/core/ajax/getavatar.php b/core/ajax/getavatar.php deleted file mode 100644 index 66bab0230a6..00000000000 --- a/core/ajax/getavatar.php +++ /dev/null @@ -1,14 +0,0 @@ - \OC_Avatar::get($_POST['user'], $_POST['size']))); - } else { - OC_JSON::success(array('data' => \OC_Avatar::get($_POST['user']))); - } -} else { - OC_JSON::error(); -} diff --git a/core/routes.php b/core/routes.php index 309ed7484d9..dd8222d4378 100644 --- a/core/routes.php +++ b/core/routes.php @@ -36,9 +36,6 @@ $this->create('core_ajax_vcategories_favorites', '/core/ajax/vcategories/favorit ->actionInclude('core/ajax/vcategories/favorites.php'); $this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php') ->actionInclude('core/ajax/vcategories/edit.php'); -// Avatars -$this->create('core_ajax_getavatar', '/core/ajax/getavatar.php') - ->actionInclude('core/ajax/getavatar.php'); // oC JS config $this->create('js_config', '/core/js/config.js') ->actionInclude('core/js/config.php'); diff --git a/lib/avatar.php b/lib/avatar.php index dcaf81f0349..1ee1e5e742f 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -14,20 +14,26 @@ class OC_Avatar { /** - * @brief gets a link to the users avatar - * @param $user string username + * @brief gets the users avatar + * @param $user string username, if not provided, the default avatar will be returned * @param $size integer size in px of the avatar, defaults to 64 - * @return mixed link to the avatar, false if avatars are disabled + * @return mixed \OC_Image containing the avatar, a link to the avatar, false if avatars are disabled */ - public static function get ($user, $size = 64) { - $mode = OC_Config::getValue("avatar", "local"); + public static function get ($user = false, $size = 64) { + $mode = self::getMode(); if ($mode === "none") { // avatars are disabled return false; - } elseif ($mode === "gravatar") { - return \OC_Avatar::getGravatar($user, $size); - } elseif ($mode === "local") { - return \OC_Avatar::getLocalAvatar($user, $size); + } else { + if ($user === false) { + return self::getDefaultAvatar($size); + } elseif ($mode === "gravatar") { + return self::getGravatar($user, $size); + } elseif ($mode === "local") { + return self::getLocalAvatar($user, $size); + } elseif ($mode === "custom") { + return self::getCustomAvatar($user, $size); + } } } @@ -36,7 +42,7 @@ class OC_Avatar { * @return string active avatar mode */ public static function getMode () { - return OC_Config::getValue("avatar", "local"); + return \OC_Config::getValue("avatar", "local"); } /** @@ -56,15 +62,14 @@ class OC_Avatar { return true; } else { $img = new OC_Image($data); - // FIXME this always says "image/png", when loading from data $type = substr($img->mimeType(), -3); if ($type === 'peg') { $type = 'jpg'; } if ($type !== 'jpg' && $type !== 'png') { - throw new Exception(); + throw new Exception("Unknown filetype for avatar"); } if (!( $img->valid() && ($img->height() === $img->width()) )) { - throw new Exception(); + throw new Exception("Invalid image, or the provided image is not square"); } $view->unlink('avatar.jpg'); @@ -78,16 +83,16 @@ class OC_Avatar { * @brief get the users gravatar * @param $user string which user to get the gravatar for * @param size integer size in px of the avatar, defaults to 64 - * @return string link to the gravatar, or base64encoded, html-ready image + * @return string link to the gravatar, or \OC_Image with the default avatar */ public static function getGravatar ($user, $size = 64) { - $email = OC_Preferences::getValue($user, 'settings', 'email'); + $email = \OC_Preferences::getValue($user, 'settings', 'email'); if ($email !== null) { $emailhash = md5(strtolower(trim($email))); $url = "http://www.gravatar.com/avatar/".$emailhash."?s=".$size; return $url; } else { - return \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar($size), 'png'); + return self::getDefaultAvatar($size); } } @@ -95,42 +100,39 @@ class OC_Avatar { * @brief get the local avatar * @param $user string which user to get the avatar for * @param $size integer size in px of the avatar, defaults to 64 - * @return string base64encoded encoded, html-ready image + * @return string \OC_Image containing the avatar */ public static function getLocalAvatar ($user, $size = 64) { $view = new \OC\Files\View('/'.$user); if ($view->file_exists('avatar.jpg')) { - $type = 'jpg'; + $ext = 'jpg'; } elseif ($view->file_exists('avatar.png')) { - $type = 'png'; + $ext = 'png'; } else { - return \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar($size), 'png'); + return self::getDefaultAvatar($size); } - $avatar = new OC_Image($view->file_get_contents('avatar.'.$type)); + $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); $avatar->resize($size); - return \OC_Avatar::wrapIntoImg((string)$avatar, $type); + return $avatar; + } + + /** + * + */ + public static function getCustomAvatar($user, $size) { + // TODO } /** * @brief gets the default avatar * @param $size integer size of the avatar in px, defaults to 64 - * @return string base64 encoded default avatar + * @return \OC_Image containing the default avatar */ public static function getDefaultAvatar ($size = 64) { $default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); $default->resize($size); - return (string)$default; - } - - /** - * @brief wrap a base64encoded image, so it can be used in html - * @param $img string base64encoded image - * @param $type string imagetype - * @return string wrapped image - */ - public static function wrapIntoImg($img, $type) { - return 'data:image/'.$type.';base64,'.$img; + return $default; } } diff --git a/settings/js/personal.js b/settings/js/personal.js index 71b4785bbf2..5d4422e48d7 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -50,9 +50,7 @@ function selectAvatar (path) { } function updateAvatar () { - $.post(OC.filePath('core', 'ajax', 'getavatar.php'), {user: OC.currentUser, size: 128}, function(data){ - $('#avatar img').attr('src', data.data); - }); + $('#avatar img').attr('src', OC.filePath('', '', 'avatar.php?user='+OC.currentUser+'&size=128')); } $(document).ready(function(){ diff --git a/settings/templates/personal.php b/settings/templates/personal.php index e0e91cb7de4..f487c847baa 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -84,12 +84,12 @@ if($_['passwordChangeSupported']) { ?> - +
      t('Avatar')); ?>
      t('Your avatar has to be a square and either a PNG or JPG image')); ?>
      -
      t('Upload a new avatar')); ?>
      +
      t('Select a new avatar from your files')); ?>
      t('Remove my avatar')); ?>
      diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 551e4e4ec46..3320ec07e0c 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -29,15 +29,17 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testLocalAvatar() { \OC_Config::setValue('avatar', 'local'); - $this->assertEquals(\OC_Avatar::get(\OC_User::getUser()), \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar(), 'png')); + $expected = \OC_Avatar::getDefaultAvatar()->data(); + $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); \OC_Avatar::setLocalAvatar(\OC_User::getUser(), $expected->data()); - $expected->resize(32); - $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())); + $expected->resize(64); + $this->assertEquals($expected->data(), \OC_Avatar::get(\OC_User::getUser())->data()); \OC_Avatar::setLocalAvatar(\OC_User::getUser(), false); - $this->assertEquals(\OC_Avatar::get(\OC_User::getUser()), \OC_Avatar::wrapIntoImg(\OC_Avatar::getDefaultAvatar(), 'png')); + $expected = \OC_Avatar::getDefaultAvatar()->data(); + $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); } public function testGravatar() { @@ -51,11 +53,6 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testDefaultAvatar() { $img = new \OC_Image(OC::$SERVERROOT.'/core/img/defaultavatar.png'); $img->resize(128); - $this->assertEquals((string)$img, \OC_Avatar::getDefaultAvatar(128)); - } - - public function testWrapIntoImg() { - $expected = "data:image/test;base64,DUMMY==123=="; - $this->assertEquals($expected, \OC_Avatar::wrapIntoImg("DUMMY==123==", "test")); + $this->assertEquals($img->data(), \OC_Avatar::getDefaultAvatar(128)->data()); } } -- cgit v1.2.3 From 9500109349f94546e4b43f6af755b20064ee9a64 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 12 Aug 2013 14:58:35 +0200 Subject: Refactor newavatar.php and show (for now) an alert on problems when setting new avatars --- lib/avatar.php | 6 ++++-- settings/ajax/newavatar.php | 38 ++++++++++++++++++++------------------ settings/js/personal.js | 17 +++++++++++++---- 3 files changed, 37 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/avatar.php b/lib/avatar.php index 1ee1e5e742f..49c82709154 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -65,11 +65,13 @@ class OC_Avatar { $type = substr($img->mimeType(), -3); if ($type === 'peg') { $type = 'jpg'; } if ($type !== 'jpg' && $type !== 'png') { - throw new Exception("Unknown filetype for avatar"); + $l = \OC_L10N::get('lib'); + throw new \Exception($l->t("Unknown filetype for avatar")); } if (!( $img->valid() && ($img->height() === $img->width()) )) { - throw new Exception("Invalid image, or the provided image is not square"); + $l = \OC_L10N::get('lib'); + throw new \Exception($l->t("Invalid image, or the provided image is not square")); } $view->unlink('avatar.jpg'); diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php index bede15e499d..126f3283fb3 100644 --- a/settings/ajax/newavatar.php +++ b/settings/ajax/newavatar.php @@ -4,28 +4,30 @@ OC_JSON::checkLoggedIn(); OC_JSON::callCheck(); $user = OC_User::getUser(); -if(isset($_POST['path'])) { - if ($_POST['path'] === "false") { // delete avatar - \OC_Avatar::setLocalAvatar($user, false); - } else { // select an image from own files - try { - $path = OC::$SERVERROOT.'/data/'.$user.'/files'.$_POST['path']; - \OC_Avatar::setLocalAvatar($user, $path); - OC_JSON::success(); - } catch (Exception $e) { - OC_JSON::error(array("msg" => $e->getMessage())); - } - } -} elseif (!empty($_FILES)) { // upload a new image +// Delete avatar +if (isset($_POST['path']) && $_POST['path'] === "false") { + $avatar = false; +} +// Select an image from own files +elseif (isset($_POST['path'])) { + //SECURITY TODO FIXME possible directory traversal here + $path = $_POST['path']; + $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; +} +// Upload a new image +elseif (!empty($_FILES)) { $files = $_FILES['files']; if ($files['error'][0] === 0) { - $data = file_get_contents($files['tmp_name'][0]); - \OC_Avatar::setLocalAvatar($user, $data); + $avatar = file_get_contents($files['tmp_name'][0]); unlink($files['tmp_name'][0]); - OC_JSON::success(); - } else { - OC_JSON::error(); } } else { OC_JSON::error(); } + +try { + \OC_Avatar::setLocalAvatar($user, $avatar); + OC_JSON::success(); +} catch (\Exception $e) { + OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); +} diff --git a/settings/js/personal.js b/settings/js/personal.js index 5d4422e48d7..ae939aaa9e6 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -45,8 +45,13 @@ function changeDisplayName(){ } function selectAvatar (path) { - $.post(OC.filePath('settings', 'ajax', 'newavatar.php'), {path: path}); - updateAvatar(); + $.post(OC.filePath('settings', 'ajax', 'newavatar.php'), {path: path}, function(data) { + if (data.status === "success") { + updateAvatar(); + } else { + OC.dialogs.alert(data.data.message, t('core', "Error")); + } + }); } function updateAvatar () { @@ -143,8 +148,12 @@ $(document).ready(function(){ }); var uploadparms = { - done: function(e) { - updateAvatar(); + done: function(e, data) { + if (data.result.status === "success") { + updateAvatar(); + } else { + OC.dialogs.alert(data.result.data.message, t('core', "Error")); + } } }; -- cgit v1.2.3 From 9c12da6a94578002aef016d7196a78acf2623eb7 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 17 Aug 2013 11:01:47 +0200 Subject: Several improvements - Don't use gravatars default avatars - Use "profile image" instead of "avatar" - Use

      instead of tables - Ease updateAvatar() - Actually return something in \OCP\Avatar --- avatar.php | 4 +++ lib/avatar.php | 15 +++++++---- lib/public/avatar.php | 4 +-- settings/js/personal.js | 2 +- settings/templates/admin.php | 56 ++++++++++++++++++----------------------- settings/templates/personal.php | 14 +++++------ settings/templates/users.php | 2 +- 7 files changed, 49 insertions(+), 48 deletions(-) (limited to 'lib') diff --git a/avatar.php b/avatar.php index 1134dc2e710..17417a470eb 100644 --- a/avatar.php +++ b/avatar.php @@ -1,5 +1,9 @@

      - t('Avatars')); ?> - - - - - - - - - - -
      - - > -
      - t('Use gravatar for avatars')); ?>
      - t('This sends data to gravatar')); ?> - -
      t('Gravatar needs an internet connection!')); ?> - -
      - > -
      - t('Use local avatars, which each user has to upload themselves')); ?> -
      - > -
      - t('Do not provide avatars')); ?> -
      + t('Profile images')); ?> +

      + + > +
      + t('Use gravatar for profile images')); ?>
      + t('This sends data to gravatar and may slow down loading')); ?> + +
      t('Gravatar needs an internet connection!')); ?> + +

      +

      + > +
      + t('Use local avatars, which each user has to upload themselves')); ?> +

      +

      + > +
      + t('Do not provide avatars')); ?> +

      diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 93aaa5ac1e7..e047ff9dcc9 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -86,18 +86,18 @@ if($_['passwordChangeSupported']) {
      - t('Avatar')); ?> + t('Profile Image')); ?>
      - t('Your avatar has to be a square and either a PNG or JPG image')); ?>
      -
      t('Upload a new avatar')); ?>
      + t('Your profile image has to be a square and either a PNG or JPG image')); ?>
      +
      t('Upload a new image')); ?>
      -
      t('Select a new avatar from your files')); ?>
      -
      t('Remove my avatar')); ?>
      +
      t('Select a new image from your files')); ?>
      +
      t('Remove my image')); ?>
      - t('Your avatar is provided by gravatar, which is based on your Email.')); ?> + t('Your profile image is provided by gravatar, which is based on your Email.')); ?> - t('Your avatar is provided by a custom service, ask your administrator, on how to change your avatar.')); ?> + t('Your profile image is provided by a custom service, ask your administrator, on how to change your image.')); ?>
      diff --git a/settings/templates/users.php b/settings/templates/users.php index 32840233d14..78bdbcd8c43 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -82,7 +82,7 @@ $_['subadmingroups'] = array_flip($items);
    t('Avatar')); ?> t('Username'))?> t( 'Display Name' )); ?>
    diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 7832c79894b..7cd5361a924 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -83,26 +83,17 @@ if($_['passwordChangeSupported']) { } ?> -
    t('Profile Image')); ?>
    - - t('Your profile image has to be a square and either a PNG or JPG image')); ?>
    -
    t('Upload a new image')); ?>
    - -
    t('Select a new image from your files')); ?>
    -
    t('Remove my image')); ?>
    - - t('Your profile image is provided by gravatar, which is based on your Email.')); ?> -
    t('Use my local avatar instead')); ?>
    - - t('Your profile image is provided by a custom service, ask your administrator, on how to change your image.')); ?> - + t('Has to be square and either PNG or JPG')); ?>
    +
    t('Upload new')); ?>
    + +
    t('Select new from files')); ?>
    +
    t('Remove image')); ?>
    -
    diff --git a/settings/templates/users.php b/settings/templates/users.php index 78bdbcd8c43..d3f356a7ba8 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -81,9 +81,7 @@ $_['subadmingroups'] = array_flip($items);
    - - - + @@ -99,9 +97,7 @@ $_['subadmingroups'] = array_flip($items); " data-displayName=""> - - - + " data-displayName=""> - + " data-displayName=""> - +
    t('Username'))?> t( 'Display Name' )); ?> t( 'Password' )); ?>
    assertEquals('local', \OC_Avatar::getMode()); - - \OC_Config::setValue('avatar', 'local'); - $this->assertEquals('local', \OC_Avatar::getMode()); - - \OC_Config::setValue('avatar', 'gravatar'); - $this->assertEquals('gravatar', \OC_Avatar::getMode()); - - \OC_Config::setValue('avatar', 'none'); - $this->assertEquals('none', \OC_Avatar::getMode()); - } - - public function testDisabledAvatar() { - \OC_Config::setValue('avatar', 'none'); - $this->assertFalse(\OC_Avatar::get(\OC_User::getUser())); - $this->assertFalse(\OC_Avatar::get(\OC_User::getUser(), 32)); - } - - public function testLocalAvatar() { - \OC_Config::setValue('avatar', 'local'); + public function testAvatar() { $expected = \OC_Avatar::getDefaultAvatar()->data(); $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); - \OC_Avatar::setLocalAvatar(\OC_User::getUser(), $expected->data()); + \OC_Avatar::set(\OC_User::getUser(), $expected->data()); $expected->resize(64); $this->assertEquals($expected->data(), \OC_Avatar::get(\OC_User::getUser())->data()); - \OC_Avatar::setLocalAvatar(\OC_User::getUser(), false); + \OC_Avatar::set(\OC_User::getUser(), false); $expected = \OC_Avatar::getDefaultAvatar()->data(); $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); } - public function testGravatar() { - \OC_Preferences::setValue(\OC_User::getUser(), 'settings', 'email', 'someone@example.com'); - \OC_Config::setValue('avatar', 'gravatar'); - $expected = "http://www.gravatar.com/avatar/".md5("someone@example.com")."?s="; - $this->assertEquals($expected."64", \OC_Avatar::get(\OC_User::getUser())); - $this->assertEquals($expected."32", \OC_Avatar::get(\OC_User::getUser(), 32)); - } - - public function testDefaultAvatar() { + /*public function testDefaultAvatar() { $img = new \OC_Image(OC::$SERVERROOT.'/core/img/defaultavatar.png'); $img->resize(128); $this->assertEquals($img->data(), \OC_Avatar::getDefaultAvatar(\OC_User::getUser(), 128)->data()); - } + }*/ } -- cgit v1.2.3 From 5eb17aadb30546c48127dfdc13cd25b721e6fe66 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 19 Aug 2013 12:38:39 +0200 Subject: Fix spacing, have remove() and return JSON for custom-default-avatars --- avatar.php | 13 ++++---- lib/avatar.php | 94 ++++++++++++++++++++++------------------------------ tests/lib/avatar.php | 14 ++------ 3 files changed, 49 insertions(+), 72 deletions(-) (limited to 'lib') diff --git a/avatar.php b/avatar.php index 70444dafcb5..a54aad3b2a6 100644 --- a/avatar.php +++ b/avatar.php @@ -12,7 +12,7 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { //SECURITY TODO does this fully eliminate directory traversals? $user = stripslashes($_GET['user']); } else { - $user = false; + exit(); } if (isset($_GET['size']) && ((int)$_GET['size'] > 0)) { @@ -28,17 +28,16 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { if ($image instanceof \OC_Image) { $image->show(); - } else { - $image = \OC_Avatar::getDefaultAvatar($user, $size); - $image->show(); + } elseif ($image === false) { + OC_JSON::success(array('user' => $user, 'size' => $size)); } } elseif ($_SERVER['REQUEST_METHOD'] === "POST") { $user = OC_User::getUser(); // Select an image from own files if (isset($_POST['path'])) { - //SECURITY TODO FIXME possible directory traversal here - $path = $_POST['path']; + //SECURITY TODO does this fully eliminate directory traversals? + $path = stripslashes($_POST['path']); $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; } // Upload a new image @@ -62,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { $user = OC_User::getUser(); try { - \OC_Avatar::set($user, false); + \OC_Avatar::remove($user); OC_JSON::success(); } catch (\Exception $e) { OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); diff --git a/lib/avatar.php b/lib/avatar.php index fa8fece080c..86be0ea2635 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -12,35 +12,31 @@ class OC_Avatar { /** - * @brief get the users avatar - * @param $user string which user to get the avatar for - * @param $size integer size in px of the avatar, defaults to 64 - * @return \OC_Image containing the avatar - */ - public static function get ($user, $size = 64) { - if ($user === false) { - return self::getDefaultAvatar($user, $size); - } - - $view = new \OC\Files\View('/'.$user); + * @brief get the users avatar + * @param $user string which user to get the avatar for + * @param $size integer size in px of the avatar, defaults to 64 + * @return mixed \OC_Image containing the avatar or false if there's no image + */ + public static function get ($user, $size = 64) { + $view = new \OC\Files\View('/'.$user); - if ($view->file_exists('avatar.jpg')) { - $ext = 'jpg'; - } elseif ($view->file_exists('avatar.png')) { - $ext = 'png'; - } else { - return self::getDefaultAvatar($user, $size); + if ($view->file_exists('avatar.jpg')) { + $ext = 'jpg'; + } elseif ($view->file_exists('avatar.png')) { + $ext = 'png'; + } else { + return false; } - $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); - $avatar->resize($size); - return $avatar; - } + $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); + $avatar->resize($size); + return $avatar; + } /** * @brief sets the users avatar * @param $user string user to set the avatar for - * @param $data mixed imagedata or path to set a new avatar, or false to delete the current avatar + * @param $data mixed imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid, or not a square * @return true on success @@ -48,43 +44,33 @@ class OC_Avatar { public static function set ($user, $data) { $view = new \OC\Files\View('/'.$user); - if ($data === false) { - $view->unlink('avatar.jpg'); - $view->unlink('avatar.png'); - return true; - } else { - $img = new OC_Image($data); - $type = substr($img->mimeType(), -3); - if ($type === 'peg') { $type = 'jpg'; } - if ($type !== 'jpg' && $type !== 'png') { - $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Unknown filetype")); - } - - if (!( $img->valid() && ($img->height() === $img->width()) )) { - $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Invalid image, or the provided image is not square")); - } + $img = new OC_Image($data); + $type = substr($img->mimeType(), -3); + if ($type === 'peg') { $type = 'jpg'; } + if ($type !== 'jpg' && $type !== 'png') { + $l = \OC_L10N::get('lib'); + throw new \Exception($l->t("Unknown filetype")); + } - $view->unlink('avatar.jpg'); - $view->unlink('avatar.png'); - $view->file_put_contents('avatar.'.$type, $data); - return true; + if (!( $img->valid() && ($img->height() === $img->width()) )) { + $l = \OC_L10N::get('lib'); + throw new \Exception($l->t("Invalid image, or the provided image is not square")); } + + $view->unlink('avatar.jpg'); + $view->unlink('avatar.png'); + $view->file_put_contents('avatar.'.$type, $data); + return true; } /** - * @brief gets the default avatar - * @brief $user string which user to get the avatar for - * @param $size integer size of the avatar in px, defaults to 64 - * @return \OC_Image containing the default avatar - * @todo use custom default images, when they arive + * @brief remove the users avatar + * @param $user string user to delete the avatar from + * @return void */ - public static function getDefaultAvatar ($user, $size = 64) { - // TODO - /*$default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png"); - $default->resize($size); - return $default;*/ - return; + public static function remove ($user) { + $view = new \OC\Files\View('/'.$user); + $view->unlink('avatar.jpg'); + $view->unlink('avatar.png'); } } diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 42b06f8bccb..adb6a5102b1 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -9,22 +9,14 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testAvatar() { - $expected = \OC_Avatar::getDefaultAvatar()->data(); - $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); + $this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())->data()); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); \OC_Avatar::set(\OC_User::getUser(), $expected->data()); $expected->resize(64); $this->assertEquals($expected->data(), \OC_Avatar::get(\OC_User::getUser())->data()); - \OC_Avatar::set(\OC_User::getUser(), false); - $expected = \OC_Avatar::getDefaultAvatar()->data(); - $this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data()); + \OC_Avatar::remove(\OC_User::getUser()); + $this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())->data()); } - - /*public function testDefaultAvatar() { - $img = new \OC_Image(OC::$SERVERROOT.'/core/img/defaultavatar.png'); - $img->resize(128); - $this->assertEquals($img->data(), \OC_Avatar::getDefaultAvatar(\OC_User::getUser(), 128)->data()); - }*/ } -- cgit v1.2.3 From 9a8908b643c69451118ab76ca36e5fa0e704bd0a Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 24 Aug 2013 00:35:32 +0200 Subject: Use Jcrop, have inline errormsg, work on cropping, clean up, WIP --- avatar.php | 24 ++++++++++++---- lib/avatar.php | 13 ++++++--- lib/notsquareexception.php | 12 ++++++++ lib/public/avatar.php | 4 --- settings/css/settings.css | 2 ++ settings/js/personal.js | 62 ++++++++++++++++++++++++++++++++--------- settings/personal.php | 2 ++ settings/templates/personal.php | 1 + 8 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 lib/notsquareexception.php (limited to 'lib') diff --git a/avatar.php b/avatar.php index a54aad3b2a6..c860ad9e369 100644 --- a/avatar.php +++ b/avatar.php @@ -36,26 +36,40 @@ if ($_SERVER['REQUEST_METHOD'] === "GET") { // Select an image from own files if (isset($_POST['path'])) { - //SECURITY TODO does this fully eliminate directory traversals? $path = stripslashes($_POST['path']); $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; } + + if (isset($_POST['crop'])) { + $crop = json_decode($_POST['crop'], true); + if (!isset($path)) { + // TODO get path to temporarily saved uploaded-avatar + } + $image = new \OC_Image($avatar); + $image->crop($x, $y, $w, $h); + $avatar = $image->data(); + } + // Upload a new image - elseif (!empty($_FILES)) { + if (!empty($_FILES)) { $files = $_FILES['files']; if ($files['error'][0] === 0) { $avatar = file_get_contents($files['tmp_name'][0]); unlink($files['tmp_name'][0]); + // TODO make the tmp_name reusable, if the uploaded avatar is not square } - } else { - OC_JSON::error(); } try { \OC_Avatar::set($user, $avatar); OC_JSON::success(); + } catch (\OC\NotSquareException $e) { + $tmpname = \OC_Util::generate_random_bytes(10); + // TODO Save the image temporarily here + // TODO add a cronjob that cleans up stale tmpimages + OC_JSON::error(array("data" => array("message" => "notsquare", "tmpname" => $tmpname) )); } catch (\Exception $e) { - OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); + OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); } } elseif ($_SERVER['REQUEST_METHOD'] === "DELETE") { $user = OC_User::getUser(); diff --git a/lib/avatar.php b/lib/avatar.php index 86be0ea2635..9ab905c852e 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -26,7 +26,7 @@ class OC_Avatar { $ext = 'png'; } else { return false; - } + } $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); $avatar->resize($size); @@ -38,7 +38,8 @@ class OC_Avatar { * @param $user string user to set the avatar for * @param $data mixed imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image - * @throws Exception if the provided image is not valid, or not a square + * @throws Exception if the provided image is not valid + * @throws \OC\NotSquareException if the image is not square * @return true on success */ public static function set ($user, $data) { @@ -52,9 +53,13 @@ class OC_Avatar { throw new \Exception($l->t("Unknown filetype")); } - if (!( $img->valid() && ($img->height() === $img->width()) )) { + if (!$img->valid()) { $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Invalid image, or the provided image is not square")); + throw new \Excpeption($l->t("Invalid image")); + } + + if (!($img->height() === $img->width())) { + throw new \OC\NotSquareException(); } $view->unlink('avatar.jpg'); diff --git a/lib/notsquareexception.php b/lib/notsquareexception.php new file mode 100644 index 00000000000..03dba8fb25f --- /dev/null +++ b/lib/notsquareexception.php @@ -0,0 +1,12 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC; + +class NotSquareException extends \Exception { +} diff --git a/lib/public/avatar.php b/lib/public/avatar.php index 768d292346f..55eff57d161 100644 --- a/lib/public/avatar.php +++ b/lib/public/avatar.php @@ -12,8 +12,4 @@ class Avatar { public static function get ($user, $size = 64) { return \OC_Avatar::get($user, $size); } - - public static function getMode () { - return \OC_Avatar::getMode(); - } } diff --git a/settings/css/settings.css b/settings/css/settings.css index e6ced0e375a..a2c3eaf6263 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -21,6 +21,8 @@ input#openid, input#webdav { width:20em; } input#identity { width:20em; } #email { width: 17em; } +#avatar .warning { width: 350px; } + .msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; } .msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; } diff --git a/settings/js/personal.js b/settings/js/personal.js index dd2d15052d1..eaf90636d35 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -45,17 +45,57 @@ function changeDisplayName(){ } function selectAvatar (path) { - $.post(OC.filePath('', '', 'avatar.php'), {path: path}, function(data) { - if (data.status === "success") { - updateAvatar(); - } else { - OC.dialogs.alert(data.data.message, t('core', "Error")); - } - }); + $.post(OC.filePath('', '', 'avatar.php'), {path: path}, avatarResponseHandler); } function updateAvatar () { - $('#avatar img').attr('src', $('#avatar img').attr('src') + '#'); + $avatarimg = $('#avatar img'); + $avatarimg.attr('src', $avatarimg.attr('src') + '#'); +} + +function showAvatarCropper() { + OC.dialogs.message('', t('settings', 'Crop'), undefined, OCdialogs.OK_BUTTON, sendCropData); + var $dialog = $('#oc-dialog-'+(OC.dialogs.dialogs_counter-1)+'-content'); + var cropper = new Image(); + $(cropper).load(function() { + $(this).attr('id', 'cropper'); + $('#oc-dialog-'+(OC.dialogs.dialogs_counter-1)+'-content').html(this); + $(this).Jcrop({ + onChange: saveCoords, + onSelect: saveCoords, + aspectRatio: 1 + }); + }).attr('src', OC.filePath('', '', 'avatar.php')+"?user="+OC.currentUser+"&size=512&tmp="+$('#avatar').data('tmpname')); +} + +function sendCropData() { + var tmp = $('#avatar').data('tmpname'); + var cropperdata = $('#cropper').data(); + var data = { + x: cropperdata.x, + y: cropperdata.y, + w: cropperdata.w, + h: cropperdata.h + }; + $.post(OC.filePath('', '', 'avatar.php'), {tmp:tmp, crop: data}, avatarResponseHandler); +} + +function saveCoords(c) { + $('#cropper').data(c); +} + +function avatarResponseHandler(data) { + $warning = $('#avatar .warning'); + $warning.hide(); + if (data.status === "success") { + updateAvatar(); + } else if (data.data.message === "notsquare") { + $('#avatar').data('tmpname', data.data.tmpname); + showAvatarCropper(); + } else { + $warning.show(); + $warning.text(data.data.message); + } } $(document).ready(function(){ @@ -149,11 +189,7 @@ $(document).ready(function(){ var uploadparms = { done: function(e, data) { - if (data.result.status === "success") { - updateAvatar(); - } else { - OC.dialogs.alert(data.result.data.message, t('core', "Error")); - } + avatarResponseHandler(data.result); } }; diff --git a/settings/personal.php b/settings/personal.php index d109d33e4bd..33c78c0467f 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -16,6 +16,8 @@ OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); \OC_Util::addScript('files', 'jquery.fileupload'); +\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min'); +\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min'); OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo(); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 7cd5361a924..5db28779b55 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -88,6 +88,7 @@ if($_['passwordChangeSupported']) { t('Profile Image')); ?>
    t('Has to be square and either PNG or JPG')); ?>
    +
    t('Upload new')); ?>
    t('Select new from files')); ?>
    -- cgit v1.2.3 From 81a45cfcf1c7064615429bb3f9759e9455868614 Mon Sep 17 00:00:00 2001 From: Stephane Martin Date: Mon, 26 Aug 2013 15:16:41 +0200 Subject: fixes #4574 --- lib/base.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 2613e88d053..c73eb9413d6 100644 --- a/lib/base.php +++ b/lib/base.php @@ -795,11 +795,16 @@ class OC { ) { return false; } - OC_App::loadApps(array('authentication')); - if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); - OC_User::unsetMagicInCookie(); - $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); + // don't redo authentication if user is already logged in + // otherwise session would be invalidated in OC_User::login with + // session_regenerate_id at every page load + if (!OC_User::isLoggedIn()) { + OC_App::loadApps(array('authentication')); + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); + } } return true; } -- cgit v1.2.3 From 31736a1df36745467ad176ee1ffe442b87546012 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 26 Aug 2013 16:46:55 +0200 Subject: Have a controller instead ofo avatar.php and fix some cropper-design --- avatar.php | 83 -------------------------------------- core/avatar/controller.php | 88 +++++++++++++++++++++++++++++++++++++++++ core/routes.php | 20 ++++++++++ lib/templatelayout.php | 2 +- settings/js/personal.js | 25 +++++++----- settings/templates/personal.php | 4 +- settings/templates/users.php | 2 +- 7 files changed, 128 insertions(+), 96 deletions(-) delete mode 100644 avatar.php create mode 100644 core/avatar/controller.php (limited to 'lib') diff --git a/avatar.php b/avatar.php deleted file mode 100644 index c860ad9e369..00000000000 --- a/avatar.php +++ /dev/null @@ -1,83 +0,0 @@ - 0)) { - $size = (int)$_GET['size']; - if ($size > 2048) { - $size = 2048; - } - } else { - $size = 64; - } - - $image = \OC_Avatar::get($user, $size); - - if ($image instanceof \OC_Image) { - $image->show(); - } elseif ($image === false) { - OC_JSON::success(array('user' => $user, 'size' => $size)); - } -} elseif ($_SERVER['REQUEST_METHOD'] === "POST") { - $user = OC_User::getUser(); - - // Select an image from own files - if (isset($_POST['path'])) { - $path = stripslashes($_POST['path']); - $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; - } - - if (isset($_POST['crop'])) { - $crop = json_decode($_POST['crop'], true); - if (!isset($path)) { - // TODO get path to temporarily saved uploaded-avatar - } - $image = new \OC_Image($avatar); - $image->crop($x, $y, $w, $h); - $avatar = $image->data(); - } - - // Upload a new image - if (!empty($_FILES)) { - $files = $_FILES['files']; - if ($files['error'][0] === 0) { - $avatar = file_get_contents($files['tmp_name'][0]); - unlink($files['tmp_name'][0]); - // TODO make the tmp_name reusable, if the uploaded avatar is not square - } - } - - try { - \OC_Avatar::set($user, $avatar); - OC_JSON::success(); - } catch (\OC\NotSquareException $e) { - $tmpname = \OC_Util::generate_random_bytes(10); - // TODO Save the image temporarily here - // TODO add a cronjob that cleans up stale tmpimages - OC_JSON::error(array("data" => array("message" => "notsquare", "tmpname" => $tmpname) )); - } catch (\Exception $e) { - OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); - } -} elseif ($_SERVER['REQUEST_METHOD'] === "DELETE") { - $user = OC_User::getUser(); - - try { - \OC_Avatar::remove($user); - OC_JSON::success(); - } catch (\Exception $e) { - OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); - } -} diff --git a/core/avatar/controller.php b/core/avatar/controller.php new file mode 100644 index 00000000000..cd51810e0e0 --- /dev/null +++ b/core/avatar/controller.php @@ -0,0 +1,88 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class CoreAvatarController { + public static function getAvatar($args) { + if (!\OC_User::isLoggedIn()) { + header("HTTP/1.0 403 Forbidden"); + \OC_Template::printErrorPage("Permission denied"); + return; + } + + $user = stripslashes($args['user']); + $size = (int)$args['size']; + if ($size > 2048) { + $size = 2048; + } + // Undefined size + elseif ($size === 0) { + $size = 64; + } + + $image = \OC_Avatar::get($user, $size); + + if ($image instanceof \OC_Image) { + $image->show(); + } elseif ($image === false) { + \OC_JSON::success(array('user' => $user, 'size' => $size)); + } + } + + public static function postAvatar($args) { + $user = \OC_User::getUser(); + + if (isset($_POST['path'])) { + $path = stripslashes($_POST['path']); + $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; + } + + if (!empty($_FILES)) { + $files = $_FILES['files']; + if ($files['error'][0] === 0) { + $avatar = file_get_contents($files['tmp_name'][0]); + unlink($files['tmp_name'][0]); + } + } + + try { + \OC_Avatar::set($user, $avatar); + \OC_JSON::success(); + } catch (\OC\NotSquareException $e) { + // TODO move unfitting avatar to /datadir/$user/tmpavatar{png.jpg} here + \OC_JSON::error(array("data" => array("message" => "notsquare") )); + } catch (\Exception $e) { + \OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); + } + } + + public static function deleteAvatar($args) { + $user = OC_User::getUser(); + + try { + \OC_Avatar::remove($user); + \OC_JSON::success(); + } catch (\Exception $e) { + \OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); + } + } + + public static function getTmpAvatar($args) { + // TODO deliver /datadir/$user/tmpavatar.{png|jpg} here, filename may include a timestamp + // TODO make a cronjob that cleans up the tmpavatar after it's older than 2 hours, should be run every hour + $user = OC_User::getUser(); + } + + public static function postCroppedAvatar($args) { + $user = OC_User::getUser(); + $crop = json_decode($_POST['crop'], true); + $image = new \OC_Image($avatar); + $image->crop($x, $y, $w, $h); + $avatar = $image->data(); + $cropped = true; + } +} diff --git a/core/routes.php b/core/routes.php index dd8222d4378..150dbab9c10 100644 --- a/core/routes.php +++ b/core/routes.php @@ -57,6 +57,26 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{ ->post() ->action('OC_Core_LostPassword_Controller', 'resetPassword'); +// Avatar routes +OC::$CLASSPATH['CoreAvatarController'] = 'core/avatar/controller.php'; +$this->create('core_avatar_get', '/avatar/{user}/{size}') + ->defaults(array('user' => '', 'size' => 64)) + ->get() + ->action('CoreAvatarController', 'getAvatar'); +$this->create('core_avatar_post', '/avatar/') + ->post() + ->action('CoreAvatarController', 'postAvatar'); +$this->create('core_avatar_delete', '/avatar/') + ->delete() + ->action('CoreAvatarController', 'deleteAvatar'); +$this->create('core_avatar_get_tmp', '/avatar/tmp/{size}') + ->defaults(array('size' => 64)) + ->get() + ->action('CoreAvatarController', 'getTmpAvatar'); +$this->create('core_avatar_post_cropped', '/avatar/cropped') + ->post() + ->action('CoreAvatarController', 'postCroppedAvatar'); + // Not specifically routed $this->create('app_css', '/apps/{app}/{file}') ->requirements(array('file' => '.*.css')) diff --git a/lib/templatelayout.php b/lib/templatelayout.php index c26dff4176c..2e31b0395d5 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -20,7 +20,7 @@ class OC_TemplateLayout extends OC_Template { // display avatars if they are enabled if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar', 'local') === 'local') { - $this->assign('avatar', ''); + $this->assign('avatar', ''); } // Update notification diff --git a/settings/js/personal.js b/settings/js/personal.js index eaf90636d35..e97d0d64c92 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -45,7 +45,7 @@ function changeDisplayName(){ } function selectAvatar (path) { - $.post(OC.filePath('', '', 'avatar.php'), {path: path}, avatarResponseHandler); + $.post(OC.router_base_url+'/avatar/', {path: path}, avatarResponseHandler); } function updateAvatar () { @@ -54,22 +54,30 @@ function updateAvatar () { } function showAvatarCropper() { - OC.dialogs.message('', t('settings', 'Crop'), undefined, OCdialogs.OK_BUTTON, sendCropData); - var $dialog = $('#oc-dialog-'+(OC.dialogs.dialogs_counter-1)+'-content'); + var $dlg = $('
    '); + $('body').append($dlg); + $('#cropperbox').ocdialog({ + width: '600px', + height: '600px', + buttons: [{ + text: t('settings', 'Crop'), + click: sendCropData, + defaultButton: true + }] + }); var cropper = new Image(); $(cropper).load(function() { $(this).attr('id', 'cropper'); - $('#oc-dialog-'+(OC.dialogs.dialogs_counter-1)+'-content').html(this); + $('#cropperbox').html(this); $(this).Jcrop({ onChange: saveCoords, onSelect: saveCoords, aspectRatio: 1 }); - }).attr('src', OC.filePath('', '', 'avatar.php')+"?user="+OC.currentUser+"&size=512&tmp="+$('#avatar').data('tmpname')); + }).attr('src', OC.router_base_url+'/avatar/tmp/512'); } function sendCropData() { - var tmp = $('#avatar').data('tmpname'); var cropperdata = $('#cropper').data(); var data = { x: cropperdata.x, @@ -77,7 +85,7 @@ function sendCropData() { w: cropperdata.w, h: cropperdata.h }; - $.post(OC.filePath('', '', 'avatar.php'), {tmp:tmp, crop: data}, avatarResponseHandler); + $.post(OC.router_base_url+'/avatar/', {crop: data}, avatarResponseHandler); } function saveCoords(c) { @@ -90,7 +98,6 @@ function avatarResponseHandler(data) { if (data.status === "success") { updateAvatar(); } else if (data.data.message === "notsquare") { - $('#avatar').data('tmpname', data.data.tmpname); showAvatarCropper(); } else { $warning.show(); @@ -206,7 +213,7 @@ $(document).ready(function(){ $('#removeavatar').click(function(){ $.ajax({ type: 'DELETE', - url: OC.filePath('', '', 'avatar.php'), + url: OC.router_base_url+'/avatar/', success: function(msg) { updateAvatar(); } diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 5db28779b55..1ea005cf335 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -83,10 +83,10 @@ if($_['passwordChangeSupported']) { } ?> - +
    t('Profile Image')); ?> -
    +
    t('Has to be square and either PNG or JPG')); ?>
    t('Upload new')); ?>
    diff --git a/settings/templates/users.php b/settings/templates/users.php index d3f356a7ba8..32ca6e0b106 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -97,7 +97,7 @@ $_['subadmingroups'] = array_flip($items);
    Date: Mon, 26 Aug 2013 17:41:19 +0200 Subject: Clean up some cruft --- core/templates/layout.user.php | 2 +- lib/templatelayout.php | 5 +---- settings/templates/personal.php | 3 --- settings/users.php | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 0ab6a4dc08b..dfcfd544cfe 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,7 +46,7 @@ src="" alt="getName()); ?>" /> - +
      diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 2e31b0395d5..b69d932c0a0 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -18,10 +18,7 @@ class OC_TemplateLayout extends OC_Template { $this->assign('bodyid', 'body-user'); } - // display avatars if they are enabled - if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar', 'local') === 'local') { - $this->assign('avatar', ''); - } + $this->assign('avatar', ''); // Update notification if(OC_Config::getValue('updatechecker', true) === true) { diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 1ea005cf335..9602414b668 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -74,9 +74,6 @@ if($_['passwordChangeSupported']) {
      t('Fill in an email address to enable password recovery'));?> - t('
      Your Email will be used for your gravatar')); - } ?> $displayName) { $users[] = array( "name" => $uid, - "avatar" => \OC_Avatar::get($uid, 32), "displayName" => $displayName, "groups" => OC_Group::getUserGroups($uid), 'quota' => $quota, -- cgit v1.2.3 From 21fd352c1aaa5df3799d52e4a0315e5750d28ebe Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 26 Aug 2013 23:48:18 +0200 Subject: as a quick example the public contacts API has been ported over as a service hosted within the server container --- lib/contactsmanager.php | 145 ++++++++++++++++++++++++++++++++ lib/public/contacts.php | 55 ++++--------- lib/public/core/contacts/imanager.php | 150 ++++++++++++++++++++++++++++++++++ lib/public/core/iservercontainer.php | 4 + lib/server.php | 15 +++- 5 files changed, 329 insertions(+), 40 deletions(-) create mode 100644 lib/contactsmanager.php create mode 100644 lib/public/core/contacts/imanager.php (limited to 'lib') diff --git a/lib/contactsmanager.php b/lib/contactsmanager.php new file mode 100644 index 00000000000..59c413ec03b --- /dev/null +++ b/lib/contactsmanager.php @@ -0,0 +1,145 @@ +. + * + */ + +namespace OC { + + class ContactsManager implements \OCP\Core\Contacts\IManager { + + /** + * This function is used to search and find contacts within the users address books. + * In case $pattern is empty all contacts will be returned. + * + * @param string $pattern which should match within the $searchProperties + * @param array $searchProperties defines the properties within the query pattern should match + * @param array $options - for future use. One should always have options! + * @return array of contacts which are arrays of key-value-pairs + */ + public function search($pattern, $searchProperties = array(), $options = array()) { + $result = array(); + foreach($this->address_books as $address_book) { + $r = $address_book->search($pattern, $searchProperties, $options); + $result = array_merge($result, $r); + } + + return $result; + } + + /** + * This function can be used to delete the contact identified by the given id + * + * @param object $id the unique identifier to a contact + * @param $address_book_key + * @return bool successful or not + */ + public function delete($id, $address_book_key) { + if (!array_key_exists($address_book_key, $this->address_books)) + return null; + + $address_book = $this->address_books[$address_book_key]; + if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE) + return null; + + return $address_book->delete($id); + } + + /** + * This function is used to create a new contact if 'id' is not given or not present. + * Otherwise the contact will be updated by replacing the entire data set. + * + * @param array $properties this array if key-value-pairs defines a contact + * @param $address_book_key string to identify the address book in which the contact shall be created or updated + * @return array representing the contact just created or updated + */ + public function createOrUpdate($properties, $address_book_key) { + + if (!array_key_exists($address_book_key, $this->address_books)) + return null; + + $address_book = $this->address_books[$address_book_key]; + if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE) + return null; + + return $address_book->createOrUpdate($properties); + } + + /** + * Check if contacts are available (e.g. contacts app enabled) + * + * @return bool true if enabled, false if not + */ + public function isEnabled() { + return !empty($this->address_books); + } + + /** + * @param \OCP\IAddressBook $address_book + */ + public function registerAddressBook(\OCP\IAddressBook $address_book) { + $this->address_books[$address_book->getKey()] = $address_book; + } + + /** + * @param \OCP\IAddressBook $address_book + */ + public function unregisterAddressBook(\OCP\IAddressBook $address_book) { + unset($this->address_books[$address_book->getKey()]); + } + + /** + * @return array + */ + public function getAddressBooks() { + $result = array(); + foreach($this->address_books as $address_book) { + $result[$address_book->getKey()] = $address_book->getDisplayName(); + } + + return $result; + } + + /** + * removes all registered address book instances + */ + public function clear() { + $this->address_books = array(); + } + + /** + * @var \OCP\IAddressBook[] which holds all registered address books + */ + private $address_books = array(); + + /** + * In order to improve lazy loading a closure can be registered which will be called in case + * address books are actually requested + * + * @param string $key + * @param \Closure $callable + */ + function register($key, \Closure $callable) + { + // + //TODO: implement me + // + } + } +} diff --git a/lib/public/contacts.php b/lib/public/contacts.php index 88d812e735a..1b61d7aa4ff 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -90,13 +90,8 @@ namespace OCP { * @return array of contacts which are arrays of key-value-pairs */ public static function search($pattern, $searchProperties = array(), $options = array()) { - $result = array(); - foreach(self::$address_books as $address_book) { - $r = $address_book->search($pattern, $searchProperties, $options); - $result = array_merge($result, $r); - } - - return $result; + $cm = \OC::$server->getContactsManager(); + return $cm->search($pattern, $searchProperties, $options); } /** @@ -107,14 +102,8 @@ namespace OCP { * @return bool successful or not */ public static function delete($id, $address_book_key) { - if (!array_key_exists($address_book_key, self::$address_books)) - return null; - - $address_book = self::$address_books[$address_book_key]; - if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE) - return null; - - return $address_book->delete($id); + $cm = \OC::$server->getContactsManager(); + return $cm->delete($id, $address_book_key); } /** @@ -126,15 +115,8 @@ namespace OCP { * @return array representing the contact just created or updated */ public static function createOrUpdate($properties, $address_book_key) { - - if (!array_key_exists($address_book_key, self::$address_books)) - return null; - - $address_book = self::$address_books[$address_book_key]; - if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE) - return null; - - return $address_book->createOrUpdate($properties); + $cm = \OC::$server->getContactsManager(); + return $cm->search($properties, $address_book_key); } /** @@ -143,45 +125,40 @@ namespace OCP { * @return bool true if enabled, false if not */ public static function isEnabled() { - return !empty(self::$address_books); + $cm = \OC::$server->getContactsManager(); + return $cm->isEnabled(); } /** * @param \OCP\IAddressBook $address_book */ public static function registerAddressBook(\OCP\IAddressBook $address_book) { - self::$address_books[$address_book->getKey()] = $address_book; + $cm = \OC::$server->getContactsManager(); + return $cm->registerAddressBook($address_book); } /** * @param \OCP\IAddressBook $address_book */ public static function unregisterAddressBook(\OCP\IAddressBook $address_book) { - unset(self::$address_books[$address_book->getKey()]); + $cm = \OC::$server->getContactsManager(); + return $cm->unregisterAddressBook($address_book); } /** * @return array */ public static function getAddressBooks() { - $result = array(); - foreach(self::$address_books as $address_book) { - $result[$address_book->getKey()] = $address_book->getDisplayName(); - } - - return $result; + $cm = \OC::$server->getContactsManager(); + return $cm->getAddressBooks(); } /** * removes all registered address book instances */ public static function clear() { - self::$address_books = array(); + $cm = \OC::$server->getContactsManager(); + $cm->clear(); } - - /** - * @var \OCP\IAddressBook[] which holds all registered address books - */ - private static $address_books = array(); } } diff --git a/lib/public/core/contacts/imanager.php b/lib/public/core/contacts/imanager.php new file mode 100644 index 00000000000..4ae9d5766e0 --- /dev/null +++ b/lib/public/core/contacts/imanager.php @@ -0,0 +1,150 @@ +. + * + */ + +/** + * Public interface of ownCloud for apps to use. + * Contacts Class + * + */ + +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP\Core\Contacts { + + /** + * This class provides access to the contacts app. Use this class exclusively if you want to access contacts. + * + * Contacts in general will be expressed as an array of key-value-pairs. + * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1 + * + * Proposed workflow for working with contacts: + * - search for the contacts + * - manipulate the results array + * - createOrUpdate will save the given contacts overwriting the existing data + * + * For updating it is mandatory to keep the id. + * Without an id a new contact will be created. + * + */ + interface IManager { + + /** + * This function is used to search and find contacts within the users address books. + * In case $pattern is empty all contacts will be returned. + * + * Example: + * Following function shows how to search for contacts for the name and the email address. + * + * public static function getMatchingRecipient($term) { + * $cm = \OC:$server->getContactsManager(); + * // The API is not active -> nothing to do + * if (!$cm->isEnabled()) { + * return array(); + * } + * + * $result = $cm->search($term, array('FN', 'EMAIL')); + * $receivers = array(); + * foreach ($result as $r) { + * $id = $r['id']; + * $fn = $r['FN']; + * $email = $r['EMAIL']; + * if (!is_array($email)) { + * $email = array($email); + * } + * + * // loop through all email addresses of this contact + * foreach ($email as $e) { + * $displayName = $fn . " <$e>"; + * $receivers[] = array( + * 'id' => $id, + * 'label' => $displayName, + * 'value' => $displayName); + * } + * } + * + * return $receivers; + * } + * + * + * @param string $pattern which should match within the $searchProperties + * @param array $searchProperties defines the properties within the query pattern should match + * @param array $options - for future use. One should always have options! + * @return array of contacts which are arrays of key-value-pairs + */ + function search($pattern, $searchProperties = array(), $options = array()); + + /** + * This function can be used to delete the contact identified by the given id + * + * @param object $id the unique identifier to a contact + * @param $address_book_key + * @return bool successful or not + */ + function delete($id, $address_book_key); + + /** + * This function is used to create a new contact if 'id' is not given or not present. + * Otherwise the contact will be updated by replacing the entire data set. + * + * @param array $properties this array if key-value-pairs defines a contact + * @param $address_book_key string to identify the address book in which the contact shall be created or updated + * @return array representing the contact just created or updated + */ + function createOrUpdate($properties, $address_book_key); + + /** + * Check if contacts are available (e.g. contacts app enabled) + * + * @return bool true if enabled, false if not + */ + function isEnabled(); + + /** + * @param \OCP\IAddressBook $address_book + */ + function registerAddressBook(\OCP\IAddressBook $address_book); + + /** + * @param \OCP\IAddressBook $address_book + */ + function unregisterAddressBook(\OCP\IAddressBook $address_book); + + /** + * In order to improve lazy loading a closure can be registered which will be called in case + * address books are actually requested + * + * @param string $key + * @param \Closure $callable + */ + function register($key, \Closure $callable); + + /** + * @return array + */ + function getAddressBooks(); + + /** + * removes all registered address book instances + */ + function clear(); + } +} diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php index df744ab6fdf..464da19864d 100644 --- a/lib/public/core/iservercontainer.php +++ b/lib/public/core/iservercontainer.php @@ -11,4 +11,8 @@ namespace OCP\Core; */ interface IServerContainer { + /** + * @return \OCP\Core\Contacts\IManager + */ + function getContactsManager(); } diff --git a/lib/server.php b/lib/server.php index f8f25c046d6..72c82efe16b 100644 --- a/lib/server.php +++ b/lib/server.php @@ -2,6 +2,7 @@ namespace OC; +use OC\AppFramework\Utility\SimpleContainer; use OCP\Core\IServerContainer; /** @@ -10,6 +11,18 @@ use OCP\Core\IServerContainer; * * TODO: hookup all manager classes */ -class Server implements IServerContainer { +class Server extends SimpleContainer implements IServerContainer { + function __construct() { + $this->registerService('ContactsManager', function($c){ + return new ContactsManager(); + }); + } + + /** + * @return \OCP\Core\Contacts\IManager + */ + function getContactsManager() { + return $this->query('ContactsManager'); + } } -- cgit v1.2.3 From 6e8bc13aa3befba15e3df17cb32ef54d447fbfec Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 27 Aug 2013 10:58:17 +0200 Subject: fix weird logical behaviour --- lib/helper.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index dd2476eda5c..cfb29028ee3 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -858,10 +858,8 @@ class OC_Helper { } else { $total = $free; //either unknown or unlimited } - if ($total == 0) { - $total = 1; // prevent division by zero - } - if ($total >= 0) { + if ($total > 0) { + // prevent division by zero or error codes (negative values) $relative = round(($used / $total) * 10000) / 100; } else { $relative = 0; -- cgit v1.2.3 From 3e7ddbc9d932ce6c8594f9080404f85d64492cd7 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 28 Aug 2013 06:24:14 -0400 Subject: [tx-robot] updated from transifex --- apps/user_webdavauth/l10n/zh_CN.php | 4 +++- core/l10n/da.php | 6 ++++++ core/l10n/de.php | 6 ++++++ core/l10n/de_DE.php | 6 ++++++ core/l10n/et_EE.php | 6 ++++++ core/l10n/fi_FI.php | 8 ++++++++ core/l10n/ug.php | 1 + core/l10n/zh_CN.php | 18 ++++++++++++++---- l10n/ar/core.po | 4 ++-- l10n/bn_BD/core.po | 4 ++-- l10n/ca/core.po | 4 ++-- l10n/cs_CZ/core.po | 4 ++-- l10n/cy_GB/core.po | 4 ++-- l10n/da/core.po | 18 +++++++++--------- l10n/da/settings.po | 10 +++++----- l10n/de/core.po | 18 +++++++++--------- l10n/de_CH/core.po | 4 ++-- l10n/de_DE/core.po | 18 +++++++++--------- l10n/el/core.po | 4 ++-- l10n/eo/core.po | 4 ++-- l10n/es/core.po | 4 ++-- l10n/es_AR/core.po | 4 ++-- l10n/et_EE/core.po | 18 +++++++++--------- l10n/eu/core.po | 4 ++-- l10n/fa/core.po | 4 ++-- l10n/fi_FI/core.po | 23 ++++++++++++----------- l10n/fr/core.po | 4 ++-- l10n/gl/core.po | 4 ++-- l10n/he/core.po | 4 ++-- l10n/hr/core.po | 4 ++-- l10n/hu_HU/core.po | 4 ++-- l10n/id/core.po | 4 ++-- l10n/is/core.po | 4 ++-- l10n/it/core.po | 4 ++-- l10n/ja_JP/core.po | 4 ++-- l10n/ka_GE/core.po | 4 ++-- l10n/ko/core.po | 4 ++-- l10n/lb/core.po | 4 ++-- l10n/lt_LT/core.po | 4 ++-- l10n/lv/core.po | 4 ++-- l10n/mk/core.po | 4 ++-- l10n/nb_NO/core.po | 4 ++-- l10n/nl/core.po | 4 ++-- l10n/nn_NO/core.po | 4 ++-- l10n/oc/core.po | 4 ++-- l10n/pl/core.po | 4 ++-- l10n/pt_BR/core.po | 4 ++-- l10n/pt_PT/core.po | 4 ++-- l10n/ro/core.po | 4 ++-- l10n/ru/core.po | 4 ++-- l10n/sk_SK/core.po | 4 ++-- l10n/sl/core.po | 4 ++-- l10n/sq/core.po | 4 ++-- l10n/sr/core.po | 4 ++-- l10n/sv/core.po | 4 ++-- l10n/sv/settings.po | 10 +++++----- l10n/ta_LK/core.po | 4 ++-- 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_trashbin.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/th_TH/core.po | 4 ++-- l10n/tr/core.po | 4 ++-- l10n/ug/core.po | 6 +++--- l10n/ug/lib.po | 6 +++--- l10n/ug/settings.po | 25 +++++++++++++------------ l10n/uk/core.po | 4 ++-- l10n/ur_PK/core.po | 4 ++-- l10n/vi/core.po | 4 ++-- l10n/zh_CN/core.po | 35 ++++++++++++++++++----------------- l10n/zh_CN/lib.po | 15 ++++++++------- l10n/zh_CN/settings.po | 19 ++++++++++--------- l10n/zh_CN/user_webdavauth.po | 10 +++++----- l10n/zh_HK/core.po | 4 ++-- l10n/zh_TW/core.po | 4 ++-- lib/l10n/ug.php | 1 + lib/l10n/zh_CN.php | 7 ++++--- settings/l10n/da.php | 2 ++ settings/l10n/sv.php | 2 ++ settings/l10n/ug.php | 9 +++++++++ settings/l10n/zh_CN.php | 6 ++++++ 88 files changed, 301 insertions(+), 230 deletions(-) (limited to 'lib') diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php index 69046042160..a225ea7f577 100644 --- a/apps/user_webdavauth/l10n/zh_CN.php +++ b/apps/user_webdavauth/l10n/zh_CN.php @@ -1,5 +1,7 @@ "WebDAV 认证" +"WebDAV Authentication" => "WebDAV 认证", +"Address: " => "地址：", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/da.php b/core/l10n/da.php index 79ccc20d495..916975393b7 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,6 +1,12 @@ "%s delte »%s« med sig", +"Turned on maintenance mode" => "Startede vedligeholdelsestilstand", +"Turned off maintenance mode" => "standsede vedligeholdelsestilstand", +"Updated database" => "Opdaterede database", +"Updating filecache, this may take really long..." => "Opdatere filcache, dette kan tage rigtigt lang tid...", +"Updated filecache" => "Opdaterede filcache", +"... %d%% done ..." => "... %d%% færdig ...", "Category type not provided." => "Kategori typen ikke er fastsat.", "No category to add?" => "Ingen kategori at tilføje?", "This category already exists: %s" => "Kategorien eksisterer allerede: %s", diff --git a/core/l10n/de.php b/core/l10n/de.php index 2fe2f564124..300edb9141d 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,6 +1,12 @@ "%s teilte »%s« mit Ihnen", +"Turned on maintenance mode" => "Wartungsmodus eingeschaltet", +"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", +"Updated database" => "Datenbank aktualisiert", +"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...", +"Updated filecache" => "Dateicache aktualisiert", +"... %d%% done ..." => "... %d%% erledigt ...", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 60f5418727a..d70dd6e99d9 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,6 +1,12 @@ "%s geteilt »%s« mit Ihnen", +"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", +"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", +"Updated database" => "Datenbank aktualisiert", +"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...", +"Updated filecache" => "Dateicache aktualisiert", +"... %d%% done ..." => "... %d%% erledigt ...", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index a13ed032221..d9e57503817 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,6 +1,12 @@ "%s jagas sinuga »%s«", +"Turned on maintenance mode" => "Haldusreziimis", +"Turned off maintenance mode" => "Haldusreziim lõpetatud", +"Updated database" => "Uuendatud andmebaas", +"Updating filecache, this may take really long..." => "Uuendan failipuhvrit, see võib kesta väga kaua...", +"Updated filecache" => "Uuendatud failipuhver", +"... %d%% done ..." => "... %d%% tehtud ...", "Category type not provided." => "Kategooria tüüp puudub.", "No category to add?" => "Pole kategooriat, mida lisada?", "This category already exists: %s" => "See kategooria on juba olemas: %s", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index d3cfe01293e..dc603cf41de 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,6 +1,12 @@ "%s jakoi kohteen »%s« kanssasi", +"Turned on maintenance mode" => "Siirrytty ylläpitotilaan", +"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", +"Updated database" => "Tietokanta ajan tasalla", +"Updating filecache, this may take really long..." => "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan...", +"Updated filecache" => "Tiedostojen välimuisti päivitetty", +"... %d%% done ..." => "... %d%% valmis ...", "Category type not provided." => "Luokan tyyppiä ei määritelty.", "No category to add?" => "Ei lisättävää luokkaa?", "This category already exists: %s" => "Luokka on jo olemassa: %s", @@ -64,6 +70,7 @@ $TRANSLATIONS = array( "Share via email:" => "Jaa sähköpostilla:", "No people found" => "Henkilöitä ei löytynyt", "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu", +"Shared in {item} with {user}" => "{item} on jaettu {user} kanssa", "Unshare" => "Peru jakaminen", "can edit" => "voi muokata", "access control" => "Pääsyn hallinta", @@ -78,6 +85,7 @@ $TRANSLATIONS = array( "Email sent" => "Sähköposti lähetetty", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Päivitys epäonnistui. Ilmoita ongelmasta ownCloud-yhteisölle.", "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", +"%s password reset" => "%s salasanan nollaus", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.
      Jos et saa viestiä pian, tarkista roskapostikansiosi.
      Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.", "Request failed!
      Did you make sure your email/username was right?" => "Pyyntö epäonnistui!
      Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index 5cbb90d15f9..eb16e841c67 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Help" => "ياردەم", "Edit categories" => "تۈر تەھرىر", "Add" => "قوش", +"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش", "Advanced" => "ئالىي", "Finish setup" => "تەڭشەك تامام", "Log out" => "تىزىمدىن چىق" diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index a5a63e24858..5784d828c17 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,6 +1,12 @@ "%s 向您分享了 »%s«", +"Turned on maintenance mode" => "启用维护模式", +"Turned off maintenance mode" => "关闭维护模式", +"Updated database" => "数据库已更新", +"Updating filecache, this may take really long..." => "正在更新文件缓存，这可能需要较长时间...", +"Updated filecache" => "文件缓存已更新", +"... %d%% done ..." => "...已完成 %d%% ...", "Category type not provided." => "未提供分类类型。", "No category to add?" => "没有可添加分类？", "This category already exists: %s" => "此分类已存在：%s", @@ -31,12 +37,12 @@ $TRANSLATIONS = array( "Settings" => "设置", "seconds ago" => "秒前", "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"), -"_%n hour ago_::_%n hours ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array("%n 小时前"), "today" => "今天", "yesterday" => "昨天", -"_%n day ago_::_%n days ago_" => array(""), +"_%n day ago_::_%n days ago_" => array("%n 天前"), "last month" => "上月", -"_%n month ago_::_%n months ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("%n 月前"), "months ago" => "月前", "last year" => "去年", "years ago" => "年前", @@ -47,7 +53,7 @@ $TRANSLATIONS = array( "Ok" => "好", "The object type is not specified." => "未指定对象类型。", "Error" => "错误", -"The app name is not specified." => "未指定App名称。", +"The app name is not specified." => "未指定应用名称。", "The required file {file} is not installed!" => "所需文件{file}未安装！", "Shared" => "已共享", "Share" => "分享", @@ -83,6 +89,7 @@ $TRANSLATIONS = array( "Email sent" => "邮件已发送", "The update was unsuccessful. Please report this issue to the ownCloud community." => "更新不成功。请汇报将此问题汇报给 ownCloud 社区。", "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", +"%s password reset" => "重置 %s 的密码", "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "重置密码的链接已发送到您的邮箱。
      如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。
      如果没有在那里，请询问您的本地管理员。", "Request failed!
      Did you make sure your email/username was right?" => "请求失败
      您确定您的邮箱/用户名是正确的？", @@ -107,9 +114,11 @@ $TRANSLATIONS = array( "Add" => "增加", "Security Warning" => "安全警告", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。", +"For information how to properly configure your server, please see the documentation." => "关于如何配置服务器，请参见 此文档。", "Create an admin account" => "创建管理员账号", "Advanced" => "高级", "Data folder" => "数据目录", @@ -123,6 +132,7 @@ $TRANSLATIONS = array( "Finish setup" => "安装完成", "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。", "Log out" => "注销", +"More apps" => "更多应用", "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." => "请修改您的密码，以保护您的账户安全。", diff --git a/l10n/ar/core.po b/l10n/ar/core.po index c06bc5e8584..6ff2f20122a 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 29b5dea54e5..2211ac2ee42 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index f63e5e77091..6b7141c49c7 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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 18e39dc80ba..976d3cfdb5f 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index 97781ef6a33..26b314362f3 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/core.po b/l10n/da/core.po index 3566470055f..68c71a9ef2d 100644 --- a/l10n/da/core.po +++ b/l10n/da/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"Last-Translator: Sappe\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" @@ -28,28 +28,28 @@ msgstr "%s delte »%s« med sig" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Startede vedligeholdelsestilstand" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "standsede vedligeholdelsestilstand" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Opdaterede database" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Opdatere filcache, dette kan tage rigtigt lang tid..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Opdaterede filcache" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% færdig ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." diff --git a/l10n/da/settings.po b/l10n/da/settings.po index f3bdc23e486..5119c9950a2 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 15:40+0000\n" +"Last-Translator: Sappe\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" @@ -105,11 +105,11 @@ msgstr "Vent venligst..." #: js/apps.js:71 js/apps.js:72 js/apps.js:92 msgid "Error while disabling app" -msgstr "" +msgstr "Kunne ikke deaktivere app" #: js/apps.js:91 js/apps.js:104 js/apps.js:105 msgid "Error while enabling app" -msgstr "" +msgstr "Kunne ikke aktivere app" #: js/apps.js:115 msgid "Updating...." diff --git a/l10n/de/core.po b/l10n/de/core.po index f802b39ac3e..9a2039502c1 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-28 08:30+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,28 +32,28 @@ msgstr "%s teilte »%s« mit Ihnen" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Wartungsmodus eingeschaltet" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Wartungsmodus ausgeschaltet" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Datenbank aktualisiert" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Dateicache aktualisiert" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% erledigt ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index a296bfa8c9e..95a01f1ff19 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index ebd32decb87..9ef89b0fc89 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-28 08:30+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,28 +32,28 @@ msgstr "%s geteilt »%s« mit Ihnen" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Wartungsmodus eingeschaltet " #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Wartungsmodus ausgeschaltet" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Datenbank aktualisiert" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Dateicache aktualisiert" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% erledigt ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." diff --git a/l10n/el/core.po b/l10n/el/core.po index 1d48f92c642..a91b290a560 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index bb093524fc0..a11e637c695 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/es/core.po b/l10n/es/core.po index e9cb5b8f9a0..ebe8564fa85 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 12e5b363df9..06f8c7904dd 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index ffd48b28988..0af60809ed1 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-28 09:30+0000\n" +"Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,28 +26,28 @@ msgstr "%s jagas sinuga »%s«" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Haldusreziimis" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Haldusreziim lõpetatud" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Uuendatud andmebaas" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Uuendan failipuhvrit, see võib kesta väga kaua..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Uuendatud failipuhver" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% tehtud ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." diff --git a/l10n/eu/core.po b/l10n/eu/core.po index f74e5e30592..12ed7b71d2b 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index 514c10f57f2..570d7e6c1ec 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 92a3e60065d..aee3205f289 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -4,13 +4,14 @@ # # Translators: # Jiri Grönroos , 2013 +# ioxo , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-28 06:40+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -25,28 +26,28 @@ msgstr "%s jakoi kohteen »%s« kanssasi" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Siirrytty ylläpitotilaan" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Ylläpitotila laitettu pois päältä" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Tietokanta ajan tasalla" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Tiedostojen välimuisti päivitetty" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% valmis ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -338,7 +339,7 @@ msgstr "Jakaminen uudelleen ei ole salittu" #: js/share.js:317 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "{item} on jaettu {user} kanssa" #: js/share.js:338 msgid "Unshare" @@ -402,7 +403,7 @@ msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi." #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s salasanan nollaus" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 93732ea30ea..21591f1ea32 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 76e182a5b18..c594c9f86d7 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/he/core.po b/l10n/he/core.po index 05f1282b4d1..6ec8af7aaf4 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index befdae3d874..58b1610541c 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index f8d7f328ab3..f0a3a78d4fd 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/id/core.po b/l10n/id/core.po index 52e9cf631da..c42fea70e82 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/is/core.po b/l10n/is/core.po index fd37488550a..428ebc7861c 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/it/core.po b/l10n/it/core.po index 7510ac70b56..154aa4c3266 100644 --- a/l10n/it/core.po +++ b/l10n/it/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index e8a091e75a7..30dbfefeede 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 6dee08e0240..fc18e19a2f6 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index 3c34da3d738..fd2020b36d2 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index a657f8989de..90c54088503 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 7921e349d84..fba54c74e37 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 9e421bf6a58..6d064f72ab8 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 5a6ba24801b..16a948973c7 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 2c6871c83f3..39afa61d126 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 171e8aa635e..29c60b93ffa 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 4c578036d79..8a9fabb4afa 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 2bae53a78ec..f05370e6667 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 54e1e74503c..262ba294d29 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index bb1c6966b30..f39dcf53868 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 2977abfcd41..75b60246ea5 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 0086ac5350a..c59794b27a9 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 8858c441489..5766701217f 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index cd5b6a9b34a..83405bcf1c1 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 1f8428968ed..06c4333a9dd 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 2424d24dbe6..3d68349d79b 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 08526acf64e..3d063b8411d 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 0b137ab6018..563206aaec4 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 4c57d855cc2..d2f92282933 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-28 10:20+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" @@ -108,11 +108,11 @@ msgstr "Var god vänta..." #: js/apps.js:71 js/apps.js:72 js/apps.js:92 msgid "Error while disabling app" -msgstr "" +msgstr "Fel vid inaktivering av app" #: js/apps.js:91 js/apps.js:104 js/apps.js:105 msgid "Error while enabling app" -msgstr "" +msgstr "Fel vid aktivering av app" #: js/apps.js:115 msgid "Updating...." diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index d0cd9f81d70..2e5eebcca88 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 9748d786fd9..8da1fb6f5b5 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 42827509e96..5b561431a04 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 4ef21df3b27..07e3a942a01 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 0fb852ce25e..5153def3a12 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 deda7dac0ca..3fa6985763a 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index f8a39c581ce..b4195884272 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 a275a8ced5d..ac1e6d8ffd2 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 7d21647abc7..a5eed85152c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 182d33bd7fc..2a61530b56e 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 5e4bf621940..2aba7bb3e3b 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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 155df0e56d8..d9988286212 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\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/core.po b/l10n/th_TH/core.po index c633f99ca63..e963a34429c 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 9cdba88e1f1..f23d51c91ee 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 367645fae74..ab7f2d68946 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 17:30+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -505,7 +505,7 @@ msgstr "قوش" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 msgid "Security Warning" -msgstr "" +msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش" #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po index 3c833cb1694..f9f9408227a 100644 --- a/l10n/ug/lib.po +++ b/l10n/ug/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 17:30+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ." #: setup.php:185 #, php-format diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index ee0402683bd..c1174f80736 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Abduqadir Abliz , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 17:30+0000\n" +"Last-Translator: Abduqadir Abliz \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +69,7 @@ msgstr "ئىناۋەتسىز ئىلتىماس" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ" #: ajax/togglegroups.php:30 #, php-format @@ -167,23 +168,23 @@ msgstr "گۇرۇپپا قوش" #: js/users.js:436 msgid "A valid username must be provided" -msgstr "" +msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك" #: js/users.js:437 js/users.js:443 js/users.js:458 msgid "Error creating user" -msgstr "" +msgstr "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى" #: js/users.js:442 msgid "A valid password must be provided" -msgstr "" +msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك" #: personal.php:40 personal.php:41 msgid "__language_name__" -msgstr "" +msgstr "ئۇيغۇرچە" #: templates/admin.php:15 msgid "Security Warning" -msgstr "" +msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش" #: templates/admin.php:18 msgid "" @@ -196,13 +197,13 @@ msgstr "" #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "ئاگاھلاندۇرۇش تەڭشەك" #: templates/admin.php:32 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ." #: templates/admin.php:33 #, php-format @@ -211,7 +212,7 @@ msgstr "" #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان" #: templates/admin.php:47 msgid "" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 5242a384d61..effc4b28936 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 292342a9802..3db491e4092 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index bf28004b7d1..4f501bb51f6 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index cfa34c88a6d..35152650e54 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Xuetian Weng , 2013 # zhangmin , 2013 # zhangmin , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"Last-Translator: Xuetian Weng \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" @@ -26,28 +27,28 @@ msgstr "%s 向您分享了 »%s«" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "启用维护模式" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "关闭维护模式" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "数据库已更新" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "正在更新文件缓存，这可能需要较长时间..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "文件缓存已更新" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "...已完成 %d%% ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -180,7 +181,7 @@ msgstr[0] "%n 分钟前" #: js/js.js:814 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" +msgstr[0] "%n 小时前" #: js/js.js:815 msgid "today" @@ -193,7 +194,7 @@ msgstr "昨天" #: js/js.js:817 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" +msgstr[0] "%n 天前" #: js/js.js:818 msgid "last month" @@ -202,7 +203,7 @@ msgstr "上月" #: js/js.js:819 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" +msgstr[0] "%n 月前" #: js/js.js:820 msgid "months ago" @@ -251,7 +252,7 @@ msgstr "错误" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "未指定App名称。" +msgstr "未指定应用名称。" #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" @@ -399,7 +400,7 @@ msgstr "更新成功。正在重定向至 ownCloud。" #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "重置 %s 的密码" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -516,7 +517,7 @@ msgstr "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)" #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "为保证安全使用 %s 请更新您的PHP。" #: templates/installation.php:32 msgid "" @@ -541,7 +542,7 @@ msgstr "您的数据目录和文件可能可以直接被互联网访问，因为 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "关于如何配置服务器，请参见 此文档。" #: templates/installation.php:47 msgid "Create an admin account" @@ -600,7 +601,7 @@ msgstr "注销" #: templates/layout.user.php:100 msgid "More apps" -msgstr "" +msgstr "更多应用" #: templates/login.php:9 msgid "Automatic logon rejected!" diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po index 28e19119a91..08447c650f0 100644 --- a/l10n/zh_CN/lib.po +++ b/l10n/zh_CN/lib.po @@ -5,13 +5,14 @@ # Translators: # Charlie Mak , 2013 # modokwang , 2013 +# Xuetian Weng , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 19:10+0000\n" +"Last-Translator: Xuetian Weng \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" @@ -109,7 +110,7 @@ msgstr "" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "应用未提供 info.xml 文件" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" @@ -278,7 +279,7 @@ msgstr[0] "%n 分钟前" #: template/functions.php:82 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" +msgstr[0] "%n 小时前" #: template/functions.php:83 msgid "today" @@ -291,7 +292,7 @@ msgstr "昨天" #: template/functions.php:85 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" +msgstr[0] "%n 天前" #: template/functions.php:86 msgid "last month" @@ -300,7 +301,7 @@ msgstr "上月" #: template/functions.php:87 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" +msgstr[0] "%n 月前" #: template/functions.php:88 msgid "last year" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 7258511fab3..d8d9cefc362 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -6,14 +6,15 @@ # m13253 , 2013 # waterone , 2013 # modokwang , 2013 +# Xuetian Weng , 2013 # zhangmin , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 17:40+0000\n" +"Last-Translator: Xuetian Weng \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" @@ -106,11 +107,11 @@ msgstr "请稍等...." #: js/apps.js:71 js/apps.js:72 js/apps.js:92 msgid "Error while disabling app" -msgstr "" +msgstr "禁用 app 时出错" #: js/apps.js:91 js/apps.js:104 js/apps.js:105 msgid "Error while enabling app" -msgstr "" +msgstr "启用 app 时出错" #: js/apps.js:115 msgid "Updating...." @@ -134,7 +135,7 @@ msgstr "已更新" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "正在解密文件... 请稍等，可能需要一些时间。" #: js/personal.js:172 msgid "Saving..." @@ -483,15 +484,15 @@ msgstr "加密" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "加密 app 未启用，将解密您所有文件" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "登录密码" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "解密所有文件" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po index c3a8727e4b6..754dd58d6e5 100644 --- a/l10n/zh_CN/user_webdavauth.po +++ b/l10n/zh_CN/user_webdavauth.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 19:10+0000\n" +"Last-Translator: Xuetian Weng \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" @@ -28,11 +28,11 @@ msgstr "WebDAV 认证" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "地址：" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index da403426370..b5d97e73049 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index ddf0a2225d9..435e7b2b7f3 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"PO-Revision-Date: 2013-08-27 22:31+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" diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php index 731ad904d7e..e2cf38ecc8c 100644 --- a/lib/l10n/ug.php +++ b/lib/l10n/ug.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Files" => "ھۆججەتلەر", "Text" => "قىسقا ئۇچۇر", "Images" => "سۈرەتلەر", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.", "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "today" => "بۈگۈن", diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index 03bd48de74b..2c34356ea10 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -10,6 +10,7 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "需要逐一下载文件", "Back to Files" => "回到文件", "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。", +"App does not provide an info.xml file" => "应用未提供 info.xml 文件", "Application is not enabled" => "应用程序未启用", "Authentication error" => "认证出错", "Token expired. Please reload page." => "Token 过期，请刷新页面。", @@ -38,12 +39,12 @@ $TRANSLATIONS = array( "Please double check the installation guides." => "请认真检查安装指南.", "seconds ago" => "秒前", "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"), -"_%n hour ago_::_%n hours ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array("%n 小时前"), "today" => "今天", "yesterday" => "昨天", -"_%n day go_::_%n days ago_" => array(""), +"_%n day go_::_%n days ago_" => array("%n 天前"), "last month" => "上月", -"_%n month ago_::_%n months ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("%n 月前"), "last year" => "去年", "years ago" => "年前", "Could not find category \"%s\"" => "无法找到分类 \"%s\"" diff --git a/settings/l10n/da.php b/settings/l10n/da.php index f352dd459f9..b34625f75e1 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Deaktiver", "Enable" => "Aktiver", "Please wait...." => "Vent venligst...", +"Error while disabling app" => "Kunne ikke deaktivere app", +"Error while enabling app" => "Kunne ikke aktivere app", "Updating...." => "Opdaterer....", "Error while updating app" => "Der opstod en fejl under app opgraderingen", "Error" => "Fejl", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index b7a280625c8..15e0ca9b8d5 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Deaktivera", "Enable" => "Aktivera", "Please wait...." => "Var god vänta...", +"Error while disabling app" => "Fel vid inaktivering av app", +"Error while enabling app" => "Fel vid aktivering av app", "Updating...." => "Uppdaterar...", "Error while updating app" => "Fel uppstod vid uppdatering av appen", "Error" => "Fel", diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php index b62b0a7930e..df9b7e988c1 100644 --- a/settings/l10n/ug.php +++ b/settings/l10n/ug.php @@ -12,6 +12,7 @@ $TRANSLATIONS = array( "Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى", "Language changed" => "تىل ئۆزگەردى", "Invalid request" => "ئىناۋەتسىز ئىلتىماس", +"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 گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ", "Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.", @@ -32,6 +33,14 @@ $TRANSLATIONS = array( "Group Admin" => "گۇرۇپپا باشقۇرغۇچى", "Delete" => "ئۆچۈر", "add group" => "گۇرۇپپا قوش", +"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك", +"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى", +"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك", +"__language_name__" => "ئۇيغۇرچە", +"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش", +"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.", +"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان", "Sharing" => "ھەمبەھىر", "Security" => "بىخەتەرلىك", "Log" => "خاتىرە", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 82dc8774dfc..cc14a3648a8 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "禁用", "Enable" => "开启", "Please wait...." => "请稍等....", +"Error while disabling app" => "禁用 app 时出错", +"Error while enabling app" => "启用 app 时出错", "Updating...." => "正在更新....", "Error while updating app" => "更新 app 时出错", "Error" => "错误", "Update" => "更新", "Updated" => "已更新", +"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。", "Saving..." => "保存中", "deleted" => "已经删除", "undo" => "撤销", @@ -102,6 +105,9 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "使用该链接 通过WebDAV访问你的文件", "Encryption" => "加密", +"The encryption app is no longer enabled, decrypt all your file" => "加密 app 未启用，将解密您所有文件", +"Log-in password" => "登录密码", +"Decrypt all Files" => "解密所有文件", "Login Name" => "登录名称", "Create" => "创建", "Admin Recovery Password" => "管理恢复密码", -- cgit v1.2.3 From 8d8a57de7fb41030ffb69f098419616f4003119a Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 28 Aug 2013 16:39:00 +0200 Subject: Continue work on cropper --- 3rdparty | 2 +- core/avatar/controller.php | 72 +++++++++++++++++++++++++++++++++++++++------- core/routes.php | 2 +- lib/avatar.php | 6 ++-- lib/cleanupavatarjob.php | 13 +++++++++ lib/installer.php | 2 +- lib/public/avatar.php | 3 +- settings/js/personal.js | 5 ++-- tests/lib/avatar.php | 12 ++++---- 9 files changed, 92 insertions(+), 25 deletions(-) create mode 100644 lib/cleanupavatarjob.php (limited to 'lib') diff --git a/3rdparty b/3rdparty index 2f3ae9f56a9..ea5e07f1201 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 2f3ae9f56a9838b45254393e13c14f8a8c380d6b +Subproject commit ea5e07f120177092cdb11ee16d7b54fb1ff16cb3 diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 17fe4270ff7..c889385c21d 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -25,7 +25,8 @@ class OC_Core_Avatar_Controller { $size = 64; } - $image = \OC_Avatar::get($user, $size); + $ava = new \OC_Avatar(); + $image = $ava->get($user, $size); if ($image instanceof \OC_Image) { $image->show(); @@ -39,7 +40,8 @@ class OC_Core_Avatar_Controller { if (isset($_POST['path'])) { $path = stripslashes($_POST['path']); - $avatar = OC::$SERVERROOT.'/data/'.$user.'/files'.$path; + $view = new \OC\Files\View('/'.$user.'/files'); + $avatar = $view->file_get_contents($path); } if (!empty($_FILES)) { @@ -51,10 +53,22 @@ class OC_Core_Avatar_Controller { } try { - \OC_Avatar::set($user, $avatar); + $ava = new \OC_Avatar(); + $ava->set($user, $avatar); \OC_JSON::success(); } catch (\OC\NotSquareException $e) { - // TODO move unfitting avatar to /datadir/$user/tmpavatar{png.jpg} here + $image = new \OC_Image($avatar); + $ext = substr($image->mimeType(), -3); + if ($ext === 'peg') { + $ext = 'jpg'; + } elseif ($ext !== 'png') { + \OC_JSON::error(); + } + + $view = new \OC\Files\View('/'.$user); + $view->unlink('tmpavatar.png'); + $view->unlink('tmpavatar.jpg'); + $view->file_put_contents('tmpavatar.'.$ext, $image->data()); \OC_JSON::error(array("data" => array("message" => "notsquare") )); } catch (\Exception $e) { \OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); @@ -65,7 +79,8 @@ class OC_Core_Avatar_Controller { $user = OC_User::getUser(); try { - \OC_Avatar::remove($user); + $avatar = new \OC_Avatar(); + $avatar->remove($user); \OC_JSON::success(); } catch (\Exception $e) { \OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); @@ -73,17 +88,52 @@ class OC_Core_Avatar_Controller { } public static function getTmpAvatar($args) { - // TODO deliver /datadir/$user/tmpavatar.{png|jpg} here, filename may include a timestamp + // TODO deliver actual size here as well, so Jcrop can do its magic and we have the actual coordinates here again + // TODO or don't have a size parameter and only resize client sided (looks promising) + // // TODO make a cronjob that cleans up the tmpavatar after it's older than 2 hours, should be run every hour $user = OC_User::getUser(); + + $view = new \OC\Files\View('/'.$user); + if ($view->file_exists('tmpavatar.png')) { + $ext = 'png'; + } elseif ($view->file_exists('tmpavatar.jpg')) { + $ext = 'jpg'; + } else { + \OC_JSON::error(); + return; + } + + $image = new \OC_Image($view->file_get_contents('tmpavatar.'.$ext)); + $image->resize($args['size']); + $image->show(); } public static function postCroppedAvatar($args) { $user = OC_User::getUser(); - $crop = json_decode($_POST['crop'], true); - $image = new \OC_Image($avatar); - $image->crop($x, $y, $w, $h); - $avatar = $image->data(); - $cropped = true; + $view = new \OC\Files\View('/'.$user); + $crop = $_POST['crop']; + + if ($view->file_exists('tmpavatar.png')) { + $ext = 'png'; + } elseif ($view->file_exists('tmpavatar.jpg')) { + $ext = 'jpg'; + } else { + \OC_JSON::error(); + return; + } + + $image = new \OC_Image($view->file_get_contents('tmpavatar.'.$ext)); + $image->crop($crop['x'], $crop['y'], $crop['w'], $crop['h']); + try { + $avatar = new \OC_Avatar(); + $avatar->set($user, $image->data()); + // Clean up + $view->unlink('tmpavatar.png'); + $view->unlink('tmpavatar.jpg'); + \OC_JSON::success(); + } catch (\Exception $e) { + \OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); + } } } diff --git a/core/routes.php b/core/routes.php index 30c4bf544d7..25f64a18830 100644 --- a/core/routes.php +++ b/core/routes.php @@ -68,7 +68,7 @@ $this->create('core_avatar_post', '/avatar/') $this->create('core_avatar_delete', '/avatar/') ->delete() ->action('OC_Core_Avatar_Controller', 'deleteAvatar'); -$this->create('core_avatar_get_tmp', '/avatar/tmp/{size}') +$this->create('core_avatar_get_tmp', '/avatartmp/{size}') //TODO better naming, so it doesn't conflict with core_avatar_get ->defaults(array('size' => 64)) ->get() ->action('OC_Core_Avatar_Controller', 'getTmpAvatar'); diff --git a/lib/avatar.php b/lib/avatar.php index 9ab905c852e..3621b96e103 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -17,7 +17,7 @@ class OC_Avatar { * @param $size integer size in px of the avatar, defaults to 64 * @return mixed \OC_Image containing the avatar or false if there's no image */ - public static function get ($user, $size = 64) { + public function get ($user, $size = 64) { $view = new \OC\Files\View('/'.$user); if ($view->file_exists('avatar.jpg')) { @@ -42,7 +42,7 @@ class OC_Avatar { * @throws \OC\NotSquareException if the image is not square * @return true on success */ - public static function set ($user, $data) { + public function set ($user, $data) { $view = new \OC\Files\View('/'.$user); $img = new OC_Image($data); @@ -73,7 +73,7 @@ class OC_Avatar { * @param $user string user to delete the avatar from * @return void */ - public static function remove ($user) { + public function remove ($user) { $view = new \OC\Files\View('/'.$user); $view->unlink('avatar.jpg'); $view->unlink('avatar.png'); diff --git a/lib/cleanupavatarjob.php b/lib/cleanupavatarjob.php new file mode 100644 index 00000000000..16bf263d211 --- /dev/null +++ b/lib/cleanupavatarjob.php @@ -0,0 +1,13 @@ +setInterval(7200); // 2 hours + } + + public function run ($argument) { + // TODO $view + // TODO remove ALL the tmpavatars + } +} diff --git a/lib/installer.php b/lib/installer.php index 179b279c5b4..a1d2173e22c 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -426,7 +426,7 @@ class OC_Installer{ 'OC_API::', 'OC_App::', 'OC_AppConfig::', - 'OC_Avatar::', + 'OC_Avatar', 'OC_BackgroundJob::', 'OC_Config::', 'OC_DB::', diff --git a/lib/public/avatar.php b/lib/public/avatar.php index 55eff57d161..649f3240e93 100644 --- a/lib/public/avatar.php +++ b/lib/public/avatar.php @@ -10,6 +10,7 @@ namespace OCP; class Avatar { public static function get ($user, $size = 64) { - return \OC_Avatar::get($user, $size); + $avatar = new \OC_Avatar(); + return $avatar->get($user, $size); } } diff --git a/settings/js/personal.js b/settings/js/personal.js index e97d0d64c92..5d9219dd7e5 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -74,10 +74,11 @@ function showAvatarCropper() { onSelect: saveCoords, aspectRatio: 1 }); - }).attr('src', OC.router_base_url+'/avatar/tmp/512'); + }).attr('src', OC.router_base_url+'/avatartmp/512'); } function sendCropData() { + $('#cropperbox').ocdialog('close'); var cropperdata = $('#cropper').data(); var data = { x: cropperdata.x, @@ -85,7 +86,7 @@ function sendCropData() { w: cropperdata.w, h: cropperdata.h }; - $.post(OC.router_base_url+'/avatar/', {crop: data}, avatarResponseHandler); + $.post(OC.router_base_url+'/avatar/cropped', {crop: data}, avatarResponseHandler); } function saveCoords(c) { diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 76cbd85fc4f..321bb771fb4 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -9,14 +9,16 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testAvatar() { - $this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())); + $avatar = new \OC_Avatar(); + + $this->assertEquals(false, $avatar->get(\OC_User::getUser())); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); - \OC_Avatar::set(\OC_User::getUser(), $expected->data()); + $avatar->set(\OC_User::getUser(), $expected->data()); $expected->resize(64); - $this->assertEquals($expected->data(), \OC_Avatar::get(\OC_User::getUser())->data()); + $this->assertEquals($expected->data(), $avatar->get(\OC_User::getUser())->data()); - \OC_Avatar::remove(\OC_User::getUser()); - $this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())); + $avatar->remove(\OC_User::getUser()); + $this->assertEquals(false, $avatar->get(\OC_User::getUser())); } } -- cgit v1.2.3 From b5e2842e0049f64b0f7c7ba9ce8b831bd84a0d78 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 5 Jul 2013 22:24:36 +0200 Subject: Very simple log rotation --- lib/base.php | 1 + lib/log/rotate.php | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 lib/log/rotate.php (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 0c9fe329b8f..22aed1c5664 100644 --- a/lib/base.php +++ b/lib/base.php @@ -491,6 +491,7 @@ class OC { self::registerCacheHooks(); self::registerFilesystemHooks(); self::registerShareHooks(); + \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'); //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper', 'cleanTmp')); diff --git a/lib/log/rotate.php b/lib/log/rotate.php new file mode 100644 index 00000000000..d5b970c1a9e --- /dev/null +++ b/lib/log/rotate.php @@ -0,0 +1,26 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Log; + +class Rotate extends \OC\BackgroundJob\Job { + const LOG_SIZE_LIMIT = 104857600; // 100 MB + public function run($logFile) { + $filesize = filesize($logFile); + if ($filesize >= self::LOG_SIZE_LIMIT) { + $this->rotate($logFile); + } + } + + protected function rotate($logfile) { + $rotated_logfile = $logfile.'.1'; + rename($logfile, $rotated_logfile); + $msg = 'Log file "'.$logfile.'" was over 100MB, moved to "'.$rotated_logfile.'"'; + \OC_Log::write('OC\Log\Rotate', $msg, \OC_Log::WARN); + } +} -- cgit v1.2.3 From 594a2af75af8d350965d11c1e77f12f1ebae456f Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 5 Jul 2013 22:42:17 +0200 Subject: Review fixes --- lib/log/rotate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/log/rotate.php b/lib/log/rotate.php index d5b970c1a9e..d79fd40342c 100644 --- a/lib/log/rotate.php +++ b/lib/log/rotate.php @@ -11,16 +11,16 @@ namespace OC\Log; class Rotate extends \OC\BackgroundJob\Job { const LOG_SIZE_LIMIT = 104857600; // 100 MB public function run($logFile) { - $filesize = filesize($logFile); + $filesize = @filesize($logFile); if ($filesize >= self::LOG_SIZE_LIMIT) { $this->rotate($logFile); } } protected function rotate($logfile) { - $rotated_logfile = $logfile.'.1'; - rename($logfile, $rotated_logfile); - $msg = 'Log file "'.$logfile.'" was over 100MB, moved to "'.$rotated_logfile.'"'; + $rotatedLogfile = $logfile.'.1'; + rename($logfile, $rotatedLogfile); + $msg = 'Log file "'.$logfile.'" was over 100MB, moved to "'.$rotatedLogfile.'"'; \OC_Log::write('OC\Log\Rotate', $msg, \OC_Log::WARN); } } -- cgit v1.2.3 From 62560ef859a459542af50dd1905bdf8828a1d142 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 5 Jul 2013 22:59:42 +0200 Subject: Add description to log rotate class --- lib/log/rotate.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/log/rotate.php b/lib/log/rotate.php index d79fd40342c..3b976d50dce 100644 --- a/lib/log/rotate.php +++ b/lib/log/rotate.php @@ -8,6 +8,13 @@ namespace OC\Log; +/** + * This rotates the current logfile to a new name, this way the total log usage + * will stay limited and older entries are available for a while longer. The + * total disk usage is twice LOG_SIZE_LIMIT. + * For more professional log management set the 'logfile' config to a different + * location and manage that with your own tools. + */ class Rotate extends \OC\BackgroundJob\Job { const LOG_SIZE_LIMIT = 104857600; // 100 MB public function run($logFile) { -- cgit v1.2.3 From 42f3ecb60fb14ef9739b436f115d302b5d4432a1 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 10 Jul 2013 18:07:43 +0200 Subject: Check for installed state before registering the logrotate background job --- lib/base.php | 16 +++++++++++++++- lib/log/rotate.php | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 22aed1c5664..f45012bb83c 100644 --- a/lib/base.php +++ b/lib/base.php @@ -491,7 +491,7 @@ class OC { self::registerCacheHooks(); self::registerFilesystemHooks(); self::registerShareHooks(); - \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'); + self::registerLogRotate(); //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper', 'cleanTmp')); @@ -553,6 +553,20 @@ class OC { } } + /** + * register hooks for the cache + */ + public static function registerLogRotate() { + if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup + // register cache cleanup jobs + try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception + \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'); + } catch (Exception $e) { + + } + } + } + /** * register hooks for the filesystem */ diff --git a/lib/log/rotate.php b/lib/log/rotate.php index 3b976d50dce..41ef2ea299c 100644 --- a/lib/log/rotate.php +++ b/lib/log/rotate.php @@ -16,7 +16,7 @@ namespace OC\Log; * location and manage that with your own tools. */ class Rotate extends \OC\BackgroundJob\Job { - const LOG_SIZE_LIMIT = 104857600; // 100 MB + const LOG_SIZE_LIMIT = 104857600; // 100 MiB public function run($logFile) { $filesize = @filesize($logFile); if ($filesize >= self::LOG_SIZE_LIMIT) { -- cgit v1.2.3 From 3fd2df4088d17547a3a31023a75cf538c95ade18 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 28 Aug 2013 17:41:27 +0200 Subject: Only enable logrotate when configured. Also rotate size is settable. --- config/config.sample.php | 15 ++++++++++++--- lib/base.php | 3 ++- lib/log/rotate.php | 16 +++++++++------- 3 files changed, 23 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 24ba541ac5c..f5cb33732f8 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -141,10 +141,22 @@ $CONFIG = array( /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */ "loglevel" => "", +/* date format to be used while writing to the owncloud logfile */ +'logdateformat' => 'F d, Y H:i:s', + /* Append all database queries and parameters to the log file. (watch out, this option can increase the size of your log file)*/ "log_query" => false, +/* + * Configure the size in bytes log rotation should happen, 0 or false disables the rotation. + * This rotates the current owncloud logfile to a new name, this way the total log usage + * will stay limited and older entries are available for a while longer. The + * total disk usage is twice the configured size. + * WARNING: When you use this, the log entries will eventually be lost. + */ +'log_rotate_size' => false, // 104857600, // 100 MiB + /* Lifetime of the remember login cookie, default is 15 days */ "remember_login_cookie_lifetime" => 60*60*24*15, @@ -189,7 +201,4 @@ $CONFIG = array( 'customclient_desktop' => '', //http://owncloud.org/sync-clients/ 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 - -// date format to be used while writing to the owncloud logfile -'logdateformat' => 'F d, Y H:i:s' ); diff --git a/lib/base.php b/lib/base.php index f45012bb83c..2e6a37c9f4e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -557,7 +557,8 @@ class OC { * register hooks for the cache */ public static function registerLogRotate() { - if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup + if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false)) { + //don't try to do this before we are properly setup // register cache cleanup jobs try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'); diff --git a/lib/log/rotate.php b/lib/log/rotate.php index 41ef2ea299c..b620f0be15c 100644 --- a/lib/log/rotate.php +++ b/lib/log/rotate.php @@ -10,24 +10,26 @@ namespace OC\Log; /** * This rotates the current logfile to a new name, this way the total log usage - * will stay limited and older entries are available for a while longer. The - * total disk usage is twice LOG_SIZE_LIMIT. + * will stay limited and older entries are available for a while longer. * For more professional log management set the 'logfile' config to a different * location and manage that with your own tools. */ class Rotate extends \OC\BackgroundJob\Job { - const LOG_SIZE_LIMIT = 104857600; // 100 MiB + private $max_log_size; public function run($logFile) { - $filesize = @filesize($logFile); - if ($filesize >= self::LOG_SIZE_LIMIT) { - $this->rotate($logFile); + $this->max_log_size = OC_Config::getValue('log_rotate_size', false); + if ($this->max_log_size) { + $filesize = @filesize($logFile); + if ($filesize >= $this->max_log_size) { + $this->rotate($logFile); + } } } protected function rotate($logfile) { $rotatedLogfile = $logfile.'.1'; rename($logfile, $rotatedLogfile); - $msg = 'Log file "'.$logfile.'" was over 100MB, moved to "'.$rotatedLogfile.'"'; + $msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"'; \OC_Log::write('OC\Log\Rotate', $msg, \OC_Log::WARN); } } -- cgit v1.2.3 From d4952bd9df679306ff3e2a8efba1f37ed9d97044 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 28 Aug 2013 18:36:32 +0200 Subject: fix typo --- lib/log/rotate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/log/rotate.php b/lib/log/rotate.php index b620f0be15c..bf23ad588b3 100644 --- a/lib/log/rotate.php +++ b/lib/log/rotate.php @@ -17,7 +17,7 @@ namespace OC\Log; class Rotate extends \OC\BackgroundJob\Job { private $max_log_size; public function run($logFile) { - $this->max_log_size = OC_Config::getValue('log_rotate_size', false); + $this->max_log_size = \OC_Config::getValue('log_rotate_size', false); if ($this->max_log_size) { $filesize = @filesize($logFile); if ($filesize >= $this->max_log_size) { -- cgit v1.2.3 From bdf48a6daa8234b307bb7b73a231de5227e10b30 Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 28 Aug 2013 21:20:28 +0200 Subject: Use OC.Router.generate, TODO use cache, prepare for defaultavatars --- core/avatar/controller.php | 2 +- lib/cleanupavatarjob.php | 13 ------------- settings/js/personal.js | 8 ++++---- settings/personal.php | 2 ++ 4 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 lib/cleanupavatarjob.php (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index c889385c21d..8492ee909c6 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -91,7 +91,7 @@ class OC_Core_Avatar_Controller { // TODO deliver actual size here as well, so Jcrop can do its magic and we have the actual coordinates here again // TODO or don't have a size parameter and only resize client sided (looks promising) // - // TODO make a cronjob that cleans up the tmpavatar after it's older than 2 hours, should be run every hour + // TODO move the tmpavatar to the cache instead, so it's cleaned up after some time $user = OC_User::getUser(); $view = new \OC\Files\View('/'.$user); diff --git a/lib/cleanupavatarjob.php b/lib/cleanupavatarjob.php deleted file mode 100644 index 16bf263d211..00000000000 --- a/lib/cleanupavatarjob.php +++ /dev/null @@ -1,13 +0,0 @@ -setInterval(7200); // 2 hours - } - - public function run ($argument) { - // TODO $view - // TODO remove ALL the tmpavatars - } -} diff --git a/settings/js/personal.js b/settings/js/personal.js index 5d9219dd7e5..e873eb1336e 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -45,7 +45,7 @@ function changeDisplayName(){ } function selectAvatar (path) { - $.post(OC.router_base_url+'/avatar/', {path: path}, avatarResponseHandler); + $.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler); } function updateAvatar () { @@ -74,7 +74,7 @@ function showAvatarCropper() { onSelect: saveCoords, aspectRatio: 1 }); - }).attr('src', OC.router_base_url+'/avatartmp/512'); + }).attr('src', OC.Router.generate('core_avatar_get_tmp', {size: 512})); } function sendCropData() { @@ -86,7 +86,7 @@ function sendCropData() { w: cropperdata.w, h: cropperdata.h }; - $.post(OC.router_base_url+'/avatar/cropped', {crop: data}, avatarResponseHandler); + $.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler); } function saveCoords(c) { @@ -214,7 +214,7 @@ $(document).ready(function(){ $('#removeavatar').click(function(){ $.ajax({ type: 'DELETE', - url: OC.router_base_url+'/avatar/', + url: OC.Router.generate('core_avatar_delete'), success: function(msg) { updateAvatar(); } diff --git a/settings/personal.php b/settings/personal.php index b0d62645d5a..c54fad28e1f 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -18,6 +18,8 @@ OC_Util::addStyle( '3rdparty', 'chosen' ); \OC_Util::addScript('files', 'jquery.fileupload'); \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min'); \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min'); +//OC_Util::addScript('3rdparty', 'md5/md5.min'); +//OC_Util::addScript('core', 'placeholder'); OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo('/'); -- cgit v1.2.3 From 70b6e2161ec654f7049027bf6dc5072c1eda4d5e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 29 Aug 2013 10:08:53 +0200 Subject: invert logic of disable_previews --- config/config.sample.php | 2 +- lib/preview.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 76de97818d5..6dd45163677 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -191,7 +191,7 @@ $CONFIG = array( 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 // PREVIEW -'disable_previews' => false, +'enable_previews' => true, /* the max width of a generated preview, if value is null, there is no limit */ 'preview_max_x' => null, /* the max height of a generated preview, if value is null, there is no limit */ diff --git a/lib/preview.php b/lib/preview.php index a8a8580e229..164ad10ba5f 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -569,9 +569,9 @@ class Preview { * @return void */ private static function initProviders() { - if(\OC_Config::getValue('disable_previews', false)) { + if(!\OC_Config::getValue('enable_previews', true)) { $provider = new Preview\Unknown(); - self::$providers = array($provider); + self::$providers = array($provider->getMimeType() => $provider); return; } @@ -606,7 +606,7 @@ class Preview { } public static function isMimeSupported($mimetype) { - if(\OC_Config::getValue('disable_previews', false)) { + if(!\OC_Config::getValue('enable_previews', true)) { return false; } -- cgit v1.2.3 From 301cce54ccdc1dcd1bd63bf4285e870e300979b7 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 29 Aug 2013 10:49:50 +0200 Subject: webdav quota information contains the values for used and free - not total --- lib/connector/sabre/directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 66cd2fcd4e3..3181a4b310f 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -236,7 +236,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa $storageInfo = OC_Helper::getStorageInfo($this->path); return array( $storageInfo['used'], - $storageInfo['total'] + $storageInfo['free'] ); } -- cgit v1.2.3 From 0c708be76bd7c7449779ef12e48e99d9c2cd3d82 Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 29 Aug 2013 14:26:11 +0200 Subject: Use defaultavatars --- core/avatar/controller.php | 2 +- core/css/styles.css | 2 +- core/js/avatar.js | 10 ++++++++++ core/js/jquery.avatar.js | 37 +++++++++++++++++++++++++++++++++++++ core/templates/layout.user.php | 2 +- lib/base.php | 6 ++++++ lib/templatelayout.php | 2 -- settings/js/personal.js | 4 ++-- settings/personal.php | 2 -- settings/templates/personal.php | 2 +- settings/templates/users.php | 2 +- 11 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 core/js/avatar.js create mode 100644 core/js/jquery.avatar.js (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 8492ee909c6..64d9eafe52b 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -31,7 +31,7 @@ class OC_Core_Avatar_Controller { if ($image instanceof \OC_Image) { $image->show(); } elseif ($image === false) { - \OC_JSON::success(array('user' => $user, 'size' => $size)); + \OC_JSON::success(array('user' => \OC_User::getDisplayName($user), 'size' => $size)); } } diff --git a/core/css/styles.css b/core/css/styles.css index 363d36294b2..b8c637d5ec1 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -40,7 +40,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right { float:right; vertical-align:middle; padding:0.5em; } .header-right > * { vertical-align:middle; } -header .avatar { +header .avatardiv { float:right; margin-top: 6px; margin-right: 6px; diff --git a/core/js/avatar.js b/core/js/avatar.js new file mode 100644 index 00000000000..22ebf295999 --- /dev/null +++ b/core/js/avatar.js @@ -0,0 +1,10 @@ +$(document).ready(function(){ + $('header .avatardiv').avatar(OC.currentUser, 32); + // Personal settings + $('#avatar .avatardiv').avatar(OC.currentUser, 128); + // User settings + $.each($('td.avatar .avatardiv'), function(i, data) { + $(data).avatar($(data).parent().parent().data('uid'), 32); // TODO maybe a better way of getting the current name … + }); + // TODO when creating a new user, he gets a previously used avatar +}); diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js new file mode 100644 index 00000000000..f6181e1c9e2 --- /dev/null +++ b/core/js/jquery.avatar.js @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2013 Christopher Schäpers + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +(function ($) { + $.fn.avatar = function(user, height) { + // TODO there has to be a better way … + if (typeof(height) === 'undefined') { + height = this.height(); + } + if (height === 0) { + height = 64; + } + + this.height(height); + this.width(height); + + if (typeof(user) === 'undefined') { + this.placeholder('x'); + return; + } + + var $div = this; + + //$.get(OC.Router.generate('core_avatar_get', {user: user, size: height}), function(result) { // TODO does not work "Uncaught TypeError: Cannot use 'in' operator to search for 'core_avatar_get' in undefined" router.js L22 + $.get(OC.router_base_url+'/avatar/'+user+'/'+height, function(result) { + if (typeof(result) === 'object') { + $div.placeholder(result.user); + } else { + $div.html(''); + } + }); + }; +}(jQuery)); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dfcfd544cfe..edac4c040fa 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,7 +46,7 @@ src="" alt="getName()); ?>" /> - +
        diff --git a/lib/base.php b/lib/base.php index 2e6a37c9f4e..0473e25da96 100644 --- a/lib/base.php +++ b/lib/base.php @@ -265,6 +265,12 @@ class OC { OC_Util::addScript('search', 'result'); OC_Util::addScript('router'); + // defaultavatars + \OC_Util::addScript('placeholder'); + \OC_Util::addScript('3rdparty', 'md5/md5.min'); + \OC_Util::addScript('jquery.avatar'); + \OC_Util::addScript('avatar'); + OC_Util::addStyle("styles"); OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.10.0.custom"); diff --git a/lib/templatelayout.php b/lib/templatelayout.php index b69d932c0a0..0024c9d4960 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -18,8 +18,6 @@ class OC_TemplateLayout extends OC_Template { $this->assign('bodyid', 'body-user'); } - $this->assign('avatar', ''); - // Update notification if(OC_Config::getValue('updatechecker', true) === true) { $data=OC_Updater::check(); diff --git a/settings/js/personal.js b/settings/js/personal.js index e873eb1336e..03f4fbc9da9 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -49,8 +49,8 @@ function selectAvatar (path) { } function updateAvatar () { - $avatarimg = $('#avatar img'); - $avatarimg.attr('src', $avatarimg.attr('src') + '#'); + $('header .avatardiv').avatar(OC.currentUser, 32); + $('#avatar .avatardiv').avatar(OC.currentUser, 128); } function showAvatarCropper() { diff --git a/settings/personal.php b/settings/personal.php index 7ab25177b43..b0d62645d5a 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -18,8 +18,6 @@ OC_Util::addStyle( '3rdparty', 'chosen' ); \OC_Util::addScript('files', 'jquery.fileupload'); \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min'); \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min'); -\OC_Util::addScript('3rdparty', 'md5/md5.min'); -\OC_Util::addScript('core', 'placeholder'); OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo('/'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index b94b8452585..c488623a088 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -83,7 +83,7 @@ if($_['passwordChangeSupported']) {
        t('Profile Image')); ?> -
        +

        t('Has to be square and either PNG or JPG')); ?>
        t('Upload new')); ?>
        diff --git a/settings/templates/users.php b/settings/templates/users.php index 32ca6e0b106..2fe0b83cf33 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -97,7 +97,7 @@ $_['subadmingroups'] = array_flip($items);
    		Date: Thu, 29 Aug 2013 15:31:03 +0200 Subject: also emmit create hook when creating new files using touch() --- lib/files/view.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/files/view.php b/lib/files/view.php index bb737f19ef8..8aee12bf6fe 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -249,6 +249,7 @@ class View { $hooks = array('touch'); if (!$this->file_exists($path)) { + $hooks[] = 'create'; $hooks[] = 'write'; } $result = $this->basicOperation('touch', $path, $hooks, $mtime); -- cgit v1.2.3 From 728fc7f123eeedb79f01dd1f38d469857a8e15cf Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 29 Aug 2013 16:13:16 +0200 Subject: fix parameter missing warning --- lib/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index 164ad10ba5f..b40ba191fba 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -570,7 +570,7 @@ class Preview { */ private static function initProviders() { if(!\OC_Config::getValue('enable_previews', true)) { - $provider = new Preview\Unknown(); + $provider = new Preview\Unknown(array()); self::$providers = array($provider->getMimeType() => $provider); return; } -- cgit v1.2.3 From 14b67d6c5f1e3cd538714a8b5f512dd34847e795 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 29 Aug 2013 16:25:25 +0200 Subject: fixing typo --- lib/public/core/contacts/imanager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/core/contacts/imanager.php b/lib/public/core/contacts/imanager.php index 4ae9d5766e0..e8bb7bfd8e4 100644 --- a/lib/public/core/contacts/imanager.php +++ b/lib/public/core/contacts/imanager.php @@ -55,7 +55,7 @@ namespace OCP\Core\Contacts { * Following function shows how to search for contacts for the name and the email address. * * public static function getMatchingRecipient($term) { - * $cm = \OC:$server->getContactsManager(); + * $cm = \OC::$server->getContactsManager(); * // The API is not active -> nothing to do * if (!$cm->isEnabled()) { * return array(); -- cgit v1.2.3 From ecf187393becc7dc613b4fd1322e40eb58f9f0fd Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 30 Aug 2013 09:00:37 +0200 Subject: Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests --- core/avatar/controller.php | 2 -- core/js/avatar.js | 4 ++-- core/js/jquery.avatar.js | 24 ++++++++++++------------ lib/avatar.php | 10 +++++++--- lib/public/avatar.php | 16 ++++++++++++++-- settings/js/personal.js | 34 ++++++++++++++++++---------------- tests/lib/avatar.php | 2 ++ 7 files changed, 55 insertions(+), 37 deletions(-) (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index b4ee791130c..9666fd879fb 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -79,8 +79,6 @@ class OC_Core_Avatar_Controller { } public static function getTmpAvatar($args) { - // TODO deliver actual size here as well, so Jcrop can do its magic and we have the actual coordinates here again - // TODO or don't have a size parameter and only resize client sided (looks promising) $user = OC_User::getUser(); $tmpavatar = \OC_Cache::get('tmpavatar'); diff --git a/core/js/avatar.js b/core/js/avatar.js index 22ebf295999..afcd7e9f2ce 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -4,7 +4,7 @@ $(document).ready(function(){ $('#avatar .avatardiv').avatar(OC.currentUser, 128); // User settings $.each($('td.avatar .avatardiv'), function(i, data) { - $(data).avatar($(data).parent().parent().data('uid'), 32); // TODO maybe a better way of getting the current name … + $(data).avatar($(data).parent().parent().data('uid'), 32); // TODO maybe a better way of getting the current name … – may be fixed by new-user-mgmt }); - // TODO when creating a new user, he gets a previously used avatar + // TODO when creating a new user, he gets a previously used avatar – may be fixed by new user-mgmt }); diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index f6181e1c9e2..bd57a542fa7 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -6,17 +6,17 @@ */ (function ($) { - $.fn.avatar = function(user, height) { - // TODO there has to be a better way … - if (typeof(height) === 'undefined') { - height = this.height(); - } - if (height === 0) { - height = 64; + $.fn.avatar = function(user, size) { + if (typeof(size) === 'undefined') { + if (this.height() > 0) { + size = this.height(); + } else { + size = 64; + } } - this.height(height); - this.width(height); + this.height(size); + this.width(size); if (typeof(user) === 'undefined') { this.placeholder('x'); @@ -25,12 +25,12 @@ var $div = this; - //$.get(OC.Router.generate('core_avatar_get', {user: user, size: height}), function(result) { // TODO does not work "Uncaught TypeError: Cannot use 'in' operator to search for 'core_avatar_get' in undefined" router.js L22 - $.get(OC.router_base_url+'/avatar/'+user+'/'+height, function(result) { + //$.get(OC.Router.generate('core_avatar_get', {user: user, size: size}), function(result) { // TODO does not work "Uncaught TypeError: Cannot use 'in' operator to search for 'core_avatar_get' in undefined" router.js L22 + $.get(OC.router_base_url+'/avatar/'+user+'/'+size, function(result) { if (typeof(result) === 'object') { $div.placeholder(result.user); } else { - $div.html(''); + $div.html(''); } }); }; diff --git a/lib/avatar.php b/lib/avatar.php index 3621b96e103..eb1f2e18295 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -40,9 +40,14 @@ class OC_Avatar { * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid * @throws \OC\NotSquareException if the image is not square - * @return true on success + * @return void */ public function set ($user, $data) { + if (\OC_Appconfig::getValue('files_encryption', 'enabled') === "yes") { + $l = \OC_L10N::get('lib'); + throw new \Exception($l->t("Custom avatars don't work with encryption yet")); + } + $view = new \OC\Files\View('/'.$user); $img = new OC_Image($data); @@ -55,7 +60,7 @@ class OC_Avatar { if (!$img->valid()) { $l = \OC_L10N::get('lib'); - throw new \Excpeption($l->t("Invalid image")); + throw new \Exception($l->t("Invalid image")); } if (!($img->height() === $img->width())) { @@ -65,7 +70,6 @@ class OC_Avatar { $view->unlink('avatar.jpg'); $view->unlink('avatar.png'); $view->file_put_contents('avatar.'.$type, $data); - return true; } /** diff --git a/lib/public/avatar.php b/lib/public/avatar.php index 649f3240e93..f229da19543 100644 --- a/lib/public/avatar.php +++ b/lib/public/avatar.php @@ -9,8 +9,20 @@ namespace OCP; class Avatar { - public static function get ($user, $size = 64) { - $avatar = new \OC_Avatar(); + private $avatar; + + public function __construct () { + $this->avatar = new \OC_Avatar(); + + public function get ($user, $size = 64) { return $avatar->get($user, $size); } + + public function set ($user, $data) { + return $avatar->set($user, $data); + } + + public function remove ($user) { + return $avatar->remove($user); + } } diff --git a/settings/js/personal.js b/settings/js/personal.js index abb085fac06..a62b37d8d48 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -54,29 +54,31 @@ function updateAvatar () { } function showAvatarCropper() { - var $dlg = $('
    '); + var $dlg = $(''); $('body').append($dlg); - $('#cropperbox').ocdialog({ - width: '600px', - height: '600px', - buttons: [{ - text: t('settings', 'Crop'), - click: sendCropData, - defaultButton: true - }] - }); - var cropper = new Image(); - $(cropper).load(function() { - $(this).attr('id', 'cropper'); - $('#cropperbox').html(this); - $(this).Jcrop({ + + $cropperbox = $('#cropperbox'); + $cropper = $('#cropper'); + + $cropper.on('load', function() { + $cropperbox.show(); + + $cropper.Jcrop({ onChange: saveCoords, onSelect: saveCoords, aspectRatio: 1, boxHeight: 500, boxWidth: 500 }); - }).attr('src', OC.Router.generate('core_avatar_get_tmp')); + + $cropperbox.ocdialog({ + buttons: [{ + text: t('settings', 'Crop'), + click: sendCropData, + defaultButton: true + }] + }); + }); } function sendCropData() { diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 321bb771fb4..027e88d726d 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -9,6 +9,8 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testAvatar() { + $this->markTestSkipped("Setting custom avatars with encryption doesn't work yet"); + $avatar = new \OC_Avatar(); $this->assertEquals(false, $avatar->get(\OC_User::getUser())); -- cgit v1.2.3 From cc8e19ad115f296e54e46d8821e9c577230e8453 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 30 Aug 2013 11:38:49 +0200 Subject: move CSS for apps out of styles.css into new apps.css --- core/css/apps.css | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++ core/css/styles.css | 239 ---------------------------------------------------- lib/base.php | 3 +- 3 files changed, 238 insertions(+), 240 deletions(-) create mode 100644 core/css/apps.css (limited to 'lib') diff --git a/core/css/apps.css b/core/css/apps.css new file mode 100644 index 00000000000..445a3b9b59f --- /dev/null +++ b/core/css/apps.css @@ -0,0 +1,236 @@ +/* ---- APP STYLING ---- */ + +#app { + height: 100%; + width: 100%; +} +#app * { + -moz-box-sizing: border-box; box-sizing: border-box; +} + +/* Navigation: folder like structure */ +#app-navigation { + width: 300px; + height: 100%; + float: left; + -moz-box-sizing: border-box; box-sizing: border-box; + background-color: #f8f8f8; + border-right: 1px solid #ccc; +} +#app-navigation > ul { + height: 100%; + overflow: auto; + -moz-box-sizing: border-box; box-sizing: border-box; +} +#app-navigation li { + position: relative; + width: 100%; + -moz-box-sizing: border-box; box-sizing: border-box; + text-shadow: 0 1px 0 rgba(255,255,255,.9); +} +#app-navigation .active, +#app-navigation .active a, +#app-navigation li:hover > a { + background-color: #ddd; + text-shadow: 0 1px 0 rgba(255,255,255,.7); +} + +/* special rules for first-level entries and folders */ +#app-navigation > ul > li { + background-color: #f8f8f8; +} + +#app-navigation .with-icon a { + padding-left: 44px; + background-size: 16px 16px; + background-position: 14px center; + background-repeat: no-repeat; +} + +#app-navigation li > a { + display: block; + width: 100%; + height: 44px; + padding: 12px; + overflow: hidden; + -moz-box-sizing: border-box; box-sizing: border-box; + white-space: nowrap; + text-overflow: ellipsis; + color: #333; +} + +#app-navigation .collapse { + display: none; /* hide collapse button intially */ +} +#app-navigation .collapsible > .collapse { + position: absolute; + height: 44px; + width: 44px; + margin: 0; + padding: 0; + background: none; background-image: url('../img/actions/triangle-s.svg'); + background-size: 16px; background-repeat: no-repeat; background-position: center; + border: none; + border-radius: 0; + outline: none !important; + box-shadow: none; +} +#app-navigation .collapsible:hover > a { + background-image: none; +} +#app-navigation .collapsible:hover > .collapse { + display: block; +} + +#app-navigation .collapsible .collapse { + -moz-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); + -ms-transform:rotate(-90deg); + -o-transform:rotate(-90deg); + transform: rotate(-90deg); +} +#app-navigation .collapsible.open .collapse { + -moz-transform: rotate(0); + -webkit-transform: rotate(0); + -ms-transform:rotate(0); + -o-transform:rotate(0); + transform: rotate(0); +} + +/* Second level nesting for lists */ +#app-navigation > ul ul { + display: none; +} +#app-navigation > ul ul li > a { + padding-left: 32px; +} +#app-navigation > .with-icon ul li > a { + padding-left: 48px; + background-position: 24px center; +} + +#app-navigation .open { + background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); +} + +#app-navigation > ul .open:hover { + -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; +} + +#app-navigation > ul .open ul { + display: block; +} + + +/* counter and actions */ +#app-navigation .utils { + position: absolute; + right: 0; + top: 0; + bottom: 0; + font-size: 12px; +} + #app-navigation .utils button, + #app-navigation .utils .counter { + width: 44px; + height: 44px; + padding-top: 12px; + } + + +/* drag and drop */ +#app-navigation .drag-and-drop { + -moz-transition: padding-bottom 500ms ease 0s; + -o-transition: padding-bottom 500ms ease 0s; + -webkit-transition: padding-bottom 500ms ease 0s; + -ms-transition: padding-bottom 500ms ease 0s; + transition: padding-bottom 500ms ease 0s; + padding-bottom: 40px; +} +#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */ + padding: 10px 0; margin: 0; +} +#app-navigation .error { + color: #dd1144; +} + +#app-navigation .app-navigation-separator { + border-bottom: 1px solid #ddd; +} + + + +/* Part where the content will be loaded into */ +#app-content { + height: 100%; + overflow-y: auto; +} + +/* settings area */ +#app-settings { + position: fixed; + width: 299px; + bottom: 0; + border-top: 1px solid #ccc; +} +#app-settings-header { + background-color: #eee; +} +#app-settings-content { + display: none; + padding: 10px; + background-color: #eee; +} +#app-settings.open #app-settings-content { + display: block; +} + +.settings-button { + display: block; + height: 32px; + width: 100%; + padding: 0; + margin: 0; + background-color: transparent; background-image: url('../img/actions/settings.svg'); + background-position: 10px center; background-repeat: no-repeat; + box-shadow: none; + border: 0; + border-radius: 0; +} +.settings-button:hover { + background-color: #ddd; +} + +/* icons */ +.folder-icon, .delete-icon, .edit-icon, .progress-icon { + background-repeat: no-repeat; + background-position: center; +} +.folder-icon { background-image: url('../img/places/folder.svg'); } +.delete-icon { background-image: url('../img/actions/delete.svg'); } +.delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.svg'); +} +.edit-icon { background-image: url('../img/actions/rename.svg'); } +.progress-icon { + background-image: url('../img/loading.gif'); + background-size: 16px; + /* force show the loading icon, not only on hover */ + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter:alpha(opacity=100); + opacity: 1 !important; + display: inline !important; +} + +/* buttons */ +button.loading { + background-image: url('../img/loading.gif'); + background-position: right 10px center; background-repeat: no-repeat; + background-size: 16px; + padding-right: 30px; +} + diff --git a/core/css/styles.css b/core/css/styles.css index ce0d5abfc78..d435e223b31 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -711,245 +711,6 @@ div.crumb:active { -/* ---- APP STYLING ---- */ -#app { - height: 100%; - width: 100%; -} -#app * { - -moz-box-sizing: border-box; box-sizing: border-box; -} - -/* Navigation: folder like structure */ -#app-navigation { - width: 300px; - height: 100%; - float: left; - -moz-box-sizing: border-box; box-sizing: border-box; - background-color: #f8f8f8; - border-right: 1px solid #ccc; -} -#app-navigation > ul { - height: 100%; - overflow: auto; - -moz-box-sizing: border-box; box-sizing: border-box; -} -#app-navigation li { - position: relative; - width: 100%; - -moz-box-sizing: border-box; box-sizing: border-box; - text-shadow: 0 1px 0 rgba(255,255,255,.9); -} -#app-navigation .active, -#app-navigation .active a, -#app-navigation li:hover > a { - background-color: #ddd; - text-shadow: 0 1px 0 rgba(255,255,255,.7); -} - -/* special rules for first-level entries and folders */ -#app-navigation > ul > li { - background-color: #f8f8f8; -} - -#app-navigation .with-icon a { - padding-left: 44px; - background-size: 16px 16px; - background-position: 14px center; - background-repeat: no-repeat; -} - -#app-navigation li > a { - display: block; - width: 100%; - height: 44px; - padding: 12px; - overflow: hidden; - -moz-box-sizing: border-box; box-sizing: border-box; - white-space: nowrap; - text-overflow: ellipsis; - color: #333; -} - -#app-navigation .collapse { - display: none; /* hide collapse button intially */ -} -#app-navigation .collapsible > .collapse { - position: absolute; - height: 44px; - width: 44px; - margin: 0; - padding: 0; - background: none; background-image: url('../img/actions/triangle-s.svg'); - background-size: 16px; background-repeat: no-repeat; background-position: center; - border: none; - border-radius: 0; - outline: none !important; - box-shadow: none; -} -#app-navigation .collapsible:hover > a { - background-image: none; -} -#app-navigation .collapsible:hover > .collapse { - display: block; -} - -#app-navigation .collapsible .collapse { - -moz-transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - -ms-transform:rotate(-90deg); - -o-transform:rotate(-90deg); - transform: rotate(-90deg); -} -#app-navigation .collapsible.open .collapse { - -moz-transform: rotate(0); - -webkit-transform: rotate(0); - -ms-transform:rotate(0); - -o-transform:rotate(0); - transform: rotate(0); -} - -/* Second level nesting for lists */ -#app-navigation > ul ul { - display: none; -} -#app-navigation > ul ul li > a { - padding-left: 32px; -} -#app-navigation > .with-icon ul li > a { - padding-left: 48px; - background-position: 24px center; -} - -#app-navigation .open { - background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); -} - -#app-navigation > ul .open:hover { - -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; -} - -#app-navigation > ul .open ul { - display: block; -} - - -/* counter and actions */ -#app-navigation .utils { - position: absolute; - right: 0; - top: 0; - bottom: 0; - font-size: 12px; -} - #app-navigation .utils button, - #app-navigation .utils .counter { - width: 44px; - height: 44px; - padding-top: 12px; - } - - -/* drag and drop */ -#app-navigation .drag-and-drop { - -moz-transition: padding-bottom 500ms ease 0s; - -o-transition: padding-bottom 500ms ease 0s; - -webkit-transition: padding-bottom 500ms ease 0s; - -ms-transition: padding-bottom 500ms ease 0s; - transition: padding-bottom 500ms ease 0s; - padding-bottom: 40px; -} -#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */ - padding: 10px 0; margin: 0; -} -#app-navigation .error { - color: #dd1144; -} - -#app-navigation .app-navigation-separator { - border-bottom: 1px solid #ddd; -} - - - -/* Part where the content will be loaded into */ -#app-content { - height: 100%; - overflow-y: auto; -} - -/* settings area */ -#app-settings { - position: fixed; - width: 299px; - bottom: 0; - border-top: 1px solid #ccc; -} -#app-settings-header { - background-color: #eee; -} -#app-settings-content { - display: none; - padding: 10px; - background-color: #eee; -} -#app-settings.open #app-settings-content { - display: block; -} - -.settings-button { - display: block; - height: 32px; - width: 100%; - padding: 0; - margin: 0; - background-color: transparent; background-image: url('../img/actions/settings.svg'); - background-position: 10px center; background-repeat: no-repeat; - box-shadow: none; - border: 0; - border-radius: 0; -} -.settings-button:hover { - background-color: #ddd; -} - -/* icons */ -.folder-icon, .delete-icon, .edit-icon, .progress-icon { - background-repeat: no-repeat; - background-position: center; -} -.folder-icon { background-image: url('../img/places/folder.svg'); } -.delete-icon { background-image: url('../img/actions/delete.svg'); } -.delete-icon:hover, .delete-icon:focus { - background-image: url('../img/actions/delete-hover.svg'); -} -.edit-icon { background-image: url('../img/actions/rename.svg'); } -.progress-icon { - background-image: url('../img/loading.gif'); - background-size: 16px; - /* force show the loading icon, not only on hover */ - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter:alpha(opacity=100); - opacity: 1 !important; - display: inline !important; -} - -/* buttons */ -button.loading { - background-image: url('../img/loading.gif'); - background-position: right 10px center; background-repeat: no-repeat; - background-size: 16px; - padding-right: 30px; -} - - - - - /* ---- BROWSER-SPECIFIC FIXES ---- */ /* remove dotted outlines in Firefox */ diff --git a/lib/base.php b/lib/base.php index 2e6a37c9f4e..4309aaaa976 100644 --- a/lib/base.php +++ b/lib/base.php @@ -264,13 +264,14 @@ class OC { //OC_Util::addScript( "multiselect" ); OC_Util::addScript('search', 'result'); OC_Util::addScript('router'); + OC_Util::addScript("oc-requesttoken"); OC_Util::addStyle("styles"); + OC_Util::addStyle("apps"); OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.10.0.custom"); OC_Util::addStyle("jquery-tipsy"); OC_Util::addStyle("jquery.ocdialog"); - OC_Util::addScript("oc-requesttoken"); } public static function initSession() { -- cgit v1.2.3 From 9c23ed580ac02bfb21d277bc8c073b8eb331f85d Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 30 Aug 2013 11:42:32 +0200 Subject: move CSS for browser-specific fixes out of styles.css into new fixes.css --- core/css/fixes.css | 46 ++++++++++++++++++++++++++++++++++++++++++++++ core/css/styles.css | 44 -------------------------------------------- lib/base.php | 1 + 3 files changed, 47 insertions(+), 44 deletions(-) create mode 100644 core/css/fixes.css (limited to 'lib') diff --git a/core/css/fixes.css b/core/css/fixes.css new file mode 100644 index 00000000000..3df60ad5b5c --- /dev/null +++ b/core/css/fixes.css @@ -0,0 +1,46 @@ +/* ---- BROWSER-SPECIFIC FIXES ---- */ + +/* remove dotted outlines in Firefox */ +::-moz-focus-inner { + border: 0; +} + +.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } +.lte8 .delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.png'); +} + +/* IE8 needs background to be set to same color to make transparency look good. */ +.lte9 #body-login form input[type="text"] { + border: 1px solid lightgrey; /* use border to add 1px line between input fields */ + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form input[type="password"] { + /* leave out top border for 1px line between input fields*/ + border-left: 1px solid lightgrey; + border-right: 1px solid lightgrey; + border-bottom: 1px solid lightgrey; + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form label.infield { + background-color: white; /* don't change background on hover */ + -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; +} + +/* disable opacity of info text on gradient + since we cannot set a good backround color to use the filter&background hack as with the input labels */ +.lte9 #body-login p.info { + filter: initial; +} + +/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ +.ie #show, .ie #show+label { + display: none; + visibility: hidden; +} + +/* fix installation screen rendering issue for IE8+9 */ +.lte9 #body-login { + height: auto !important; +} + diff --git a/core/css/styles.css b/core/css/styles.css index d435e223b31..8f6fc6f27d1 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -709,47 +709,3 @@ div.crumb:active { opacity:.7; } - - -/* ---- BROWSER-SPECIFIC FIXES ---- */ - -/* remove dotted outlines in Firefox */ -::-moz-focus-inner { - border: 0; -} -.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } -.lte8 .delete-icon:hover, .delete-icon:focus { - background-image: url('../img/actions/delete-hover.png'); -} - -/* IE8 needs background to be set to same color to make transparency look good. */ -.lte9 #body-login form input[type="text"] { - border: 1px solid lightgrey; /* use border to add 1px line between input fields */ - background-color: white; /* don't change background on hover */ -} -.lte9 #body-login form input[type="password"] { - /* leave out top border for 1px line between input fields*/ - border-left: 1px solid lightgrey; - border-right: 1px solid lightgrey; - border-bottom: 1px solid lightgrey; - background-color: white; /* don't change background on hover */ -} -.lte9 #body-login form label.infield { - background-color: white; /* don't change background on hover */ - -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; -} -/* disable opacity of info text on gradient - sice we cannot set a good backround color to use the filter&background hack as with the input labels */ -.lte9 #body-login p.info { - filter: initial; -} -/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ -.ie #show, .ie #show+label { - display: none; - visibility: hidden; -} - -/* fix installation screen rendering issue for IE8+9 */ -.lte9 #body-login { - height: auto !important; -} diff --git a/lib/base.php b/lib/base.php index 4309aaaa976..309455879bf 100644 --- a/lib/base.php +++ b/lib/base.php @@ -268,6 +268,7 @@ class OC { OC_Util::addStyle("styles"); OC_Util::addStyle("apps"); + OC_Util::addStyle("fixes"); OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.10.0.custom"); OC_Util::addStyle("jquery-tipsy"); -- cgit v1.2.3 From 7d398ba62227cf77066585b47adfcb5188dd991b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 30 Aug 2013 00:33:48 +0200 Subject: Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616. --- lib/base.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 2e6a37c9f4e..c6e031e61d6 100644 --- a/lib/base.php +++ b/lib/base.php @@ -791,14 +791,15 @@ class OC { self::$session->set('timezone', $_POST['timezone-offset']); } - self::cleanupLoginTokens($_POST['user']); + $userid = OC_User::getUser(); + self::cleanupLoginTokens($userid); if (!empty($_POST["remember_login"])) { if (defined("DEBUG") && DEBUG) { OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); } $token = OC_Util::generate_random_bytes(32); - OC_Preferences::setValue($_POST['user'], 'login_token', $token, time()); - OC_User::setMagicInCookie($_POST["user"], $token); + OC_Preferences::setValue($userid, 'login_token', $token, time()); + OC_User::setMagicInCookie($userid, $token); } else { OC_User::unsetMagicInCookie(); } -- cgit v1.2.3 From 30526ded803e352f3f7322ed96ebc480d5e3f9c1 Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 30 Aug 2013 13:26:13 +0200 Subject: Fix \OCP\Avatar --- lib/public/avatar.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/public/avatar.php b/lib/public/avatar.php index f229da19543..6da8e83a9af 100644 --- a/lib/public/avatar.php +++ b/lib/public/avatar.php @@ -8,21 +8,5 @@ namespace OCP; -class Avatar { - private $avatar; - - public function __construct () { - $this->avatar = new \OC_Avatar(); - - public function get ($user, $size = 64) { - return $avatar->get($user, $size); - } - - public function set ($user, $data) { - return $avatar->set($user, $data); - } - - public function remove ($user) { - return $avatar->remove($user); - } +class Avatar extends \OC_Avatar { } -- cgit v1.2.3 From dbc78b1a5821b082eb8685a8916333b60d76e17c Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 30 Aug 2013 09:38:20 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ar.php | 4 +- apps/files/l10n/bg_BG.php | 7 +- apps/files/l10n/bn_BD.php | 4 +- apps/files/l10n/ca.php | 8 +- apps/files/l10n/cs_CZ.php | 10 +- apps/files/l10n/cy_GB.php | 4 +- apps/files/l10n/da.php | 8 +- apps/files/l10n/de.php | 8 +- apps/files/l10n/de_DE.php | 8 +- apps/files/l10n/el.php | 11 +- apps/files/l10n/en@pirate.php | 2 +- apps/files/l10n/eo.php | 6 +- apps/files/l10n/es.php | 8 +- apps/files/l10n/es_AR.php | 9 +- apps/files/l10n/et_EE.php | 8 +- apps/files/l10n/eu.php | 8 +- apps/files/l10n/fa.php | 8 +- apps/files/l10n/fi_FI.php | 8 +- apps/files/l10n/fr.php | 8 +- apps/files/l10n/gl.php | 8 +- apps/files/l10n/he.php | 8 +- apps/files/l10n/hi.php | 2 +- apps/files/l10n/hr.php | 8 +- apps/files/l10n/hu_HU.php | 8 +- apps/files/l10n/hy.php | 2 +- apps/files/l10n/ia.php | 4 +- apps/files/l10n/id.php | 6 +- apps/files/l10n/is.php | 4 +- apps/files/l10n/it.php | 8 +- apps/files/l10n/ja_JP.php | 8 +- apps/files/l10n/ka.php | 2 +- apps/files/l10n/ka_GE.php | 4 +- apps/files/l10n/ko.php | 6 +- apps/files/l10n/ku_IQ.php | 4 +- apps/files/l10n/lb.php | 8 +- apps/files/l10n/lt_LT.php | 6 +- apps/files/l10n/lv.php | 8 +- apps/files/l10n/mk.php | 8 +- apps/files/l10n/ms_MY.php | 8 +- apps/files/l10n/my_MM.php | 2 +- apps/files/l10n/nb_NO.php | 8 +- apps/files/l10n/nl.php | 8 +- apps/files/l10n/nn_NO.php | 4 +- apps/files/l10n/oc.php | 8 +- apps/files/l10n/pl.php | 8 +- apps/files/l10n/pt_BR.php | 8 +- apps/files/l10n/pt_PT.php | 8 +- apps/files/l10n/ro.php | 8 +- apps/files/l10n/ru.php | 8 +- apps/files/l10n/si_LK.php | 8 +- apps/files/l10n/sk_SK.php | 8 +- apps/files/l10n/sl.php | 8 +- apps/files/l10n/sq.php | 4 +- apps/files/l10n/sr.php | 4 +- apps/files/l10n/sr@latin.php | 4 +- apps/files/l10n/sv.php | 8 +- apps/files/l10n/ta_LK.php | 4 +- apps/files/l10n/te.php | 4 +- apps/files/l10n/th_TH.php | 6 +- apps/files/l10n/tr.php | 8 +- apps/files/l10n/ug.php | 4 +- apps/files/l10n/uk.php | 8 +- apps/files/l10n/ur_PK.php | 2 +- apps/files/l10n/vi.php | 6 +- apps/files/l10n/zh_CN.php | 6 +- apps/files/l10n/zh_HK.php | 4 +- apps/files/l10n/zh_TW.php | 8 +- apps/files_encryption/l10n/sk_SK.php | 10 + apps/files_trashbin/l10n/el.php | 4 +- apps/user_ldap/l10n/cs_CZ.php | 6 +- apps/user_ldap/l10n/sk_SK.php | 4 + apps/user_ldap/l10n/sv.php | 4 + core/l10n/ca.php | 1 - core/l10n/cs_CZ.php | 7 +- core/l10n/da.php | 1 - core/l10n/de.php | 1 - core/l10n/de_AT.php | 3 +- core/l10n/de_CH.php | 1 - core/l10n/de_DE.php | 1 - core/l10n/en_GB.php | 146 ++++++++ core/l10n/et_EE.php | 1 - core/l10n/eu.php | 1 - core/l10n/fi_FI.php | 1 - core/l10n/gl.php | 7 +- core/l10n/he.php | 1 - core/l10n/it.php | 7 +- core/l10n/ja_JP.php | 1 - core/l10n/lt_LT.php | 1 - core/l10n/lv.php | 1 - core/l10n/nl.php | 1 - core/l10n/pl.php | 1 - core/l10n/pt_BR.php | 1 - core/l10n/ru.php | 1 - core/l10n/sk_SK.php | 7 +- core/l10n/sv.php | 7 +- core/l10n/tr.php | 1 - core/l10n/zh_CN.php | 1 - core/l10n/zh_TW.php | 1 - l10n/af_ZA/core.po | 22 +- l10n/af_ZA/files.po | 80 ++--- l10n/ar/core.po | 22 +- l10n/ar/files.po | 96 +++--- l10n/be/core.po | 22 +- l10n/be/files.po | 88 +++-- l10n/bg_BG/core.po | 22 +- l10n/bg_BG/files.po | 80 ++--- l10n/bn_BD/core.po | 22 +- l10n/bn_BD/files.po | 80 ++--- l10n/bs/core.po | 22 +- l10n/bs/files.po | 84 ++--- l10n/ca/core.po | 22 +- l10n/ca/files.po | 80 ++--- l10n/cs_CZ/core.po | 34 +- l10n/cs_CZ/files.po | 86 +++-- l10n/cs_CZ/lib.po | 34 +- l10n/cs_CZ/settings.po | 38 +- l10n/cs_CZ/user_ldap.po | 12 +- l10n/cy_GB/core.po | 22 +- l10n/cy_GB/files.po | 88 +++-- l10n/da/core.po | 24 +- l10n/da/files.po | 80 ++--- l10n/da/lib.po | 34 +- l10n/de/core.po | 24 +- l10n/de/files.po | 80 ++--- l10n/de/lib.po | 18 +- l10n/de/settings.po | 32 +- l10n/de/user_webdavauth.po | 6 +- l10n/de_AT/core.po | 22 +- l10n/de_AT/files.po | 80 ++--- l10n/de_CH/core.po | 22 +- l10n/de_CH/files.po | 80 ++--- l10n/de_DE/core.po | 24 +- l10n/de_DE/files.po | 80 ++--- l10n/de_DE/lib.po | 26 +- l10n/de_DE/settings.po | 32 +- l10n/el/core.po | 22 +- l10n/el/files.po | 87 +++-- l10n/el/files_trashbin.po | 26 +- l10n/en@pirate/core.po | 22 +- l10n/en@pirate/files.po | 80 ++--- l10n/en_GB/core.po | 648 +++++++++++++++++++++++++++++++++++ l10n/en_GB/files.po | 336 ++++++++++++++++++ l10n/en_GB/files_encryption.po | 177 ++++++++++ l10n/en_GB/files_external.po | 124 +++++++ l10n/en_GB/files_sharing.po | 81 +++++ l10n/en_GB/files_trashbin.po | 85 +++++ l10n/en_GB/files_versions.po | 44 +++ l10n/en_GB/lib.po | 323 +++++++++++++++++ l10n/en_GB/settings.po | 541 +++++++++++++++++++++++++++++ l10n/en_GB/user_ldap.po | 407 ++++++++++++++++++++++ l10n/en_GB/user_webdavauth.po | 34 ++ l10n/eo/core.po | 22 +- l10n/eo/files.po | 80 ++--- l10n/es/core.po | 22 +- l10n/es/files.po | 80 ++--- l10n/es_AR/core.po | 22 +- l10n/es_AR/files.po | 83 ++--- l10n/et_EE/core.po | 24 +- l10n/et_EE/files.po | 80 ++--- l10n/eu/core.po | 22 +- l10n/eu/files.po | 80 ++--- l10n/fa/core.po | 22 +- l10n/fa/files.po | 76 ++-- l10n/fi_FI/core.po | 24 +- l10n/fi_FI/files.po | 80 ++--- l10n/fr/core.po | 22 +- l10n/fr/files.po | 80 ++--- l10n/gl/core.po | 34 +- l10n/gl/files.po | 80 ++--- l10n/gl/lib.po | 34 +- l10n/gl/settings.po | 32 +- l10n/he/core.po | 22 +- l10n/he/files.po | 80 ++--- l10n/hi/core.po | 22 +- l10n/hi/files.po | 80 ++--- l10n/hr/core.po | 22 +- l10n/hr/files.po | 84 ++--- l10n/hu_HU/core.po | 22 +- l10n/hu_HU/files.po | 80 ++--- l10n/hy/core.po | 22 +- l10n/hy/files.po | 80 ++--- l10n/ia/core.po | 22 +- l10n/ia/files.po | 80 ++--- l10n/id/core.po | 22 +- l10n/id/files.po | 76 ++-- l10n/is/core.po | 22 +- l10n/is/files.po | 80 ++--- l10n/it/core.po | 34 +- l10n/it/files.po | 80 ++--- l10n/it/lib.po | 32 +- l10n/ja_JP/core.po | 22 +- l10n/ja_JP/files.po | 76 ++-- l10n/ka/core.po | 22 +- l10n/ka/files.po | 76 ++-- l10n/ka_GE/core.po | 22 +- l10n/ka_GE/files.po | 76 ++-- l10n/kn/core.po | 22 +- l10n/kn/files.po | 76 ++-- l10n/ko/core.po | 22 +- l10n/ko/files.po | 80 ++--- l10n/ku_IQ/core.po | 22 +- l10n/ku_IQ/files.po | 80 ++--- l10n/lb/core.po | 22 +- l10n/lb/files.po | 80 ++--- l10n/lt_LT/core.po | 22 +- l10n/lt_LT/files.po | 84 ++--- l10n/lv/core.po | 22 +- l10n/lv/files.po | 84 ++--- l10n/mk/core.po | 22 +- l10n/mk/files.po | 80 ++--- l10n/ml_IN/core.po | 22 +- l10n/ml_IN/files.po | 80 ++--- l10n/ms_MY/core.po | 22 +- l10n/ms_MY/files.po | 76 ++-- l10n/my_MM/core.po | 22 +- l10n/my_MM/files.po | 76 ++-- l10n/nb_NO/core.po | 22 +- l10n/nb_NO/files.po | 80 ++--- l10n/ne/core.po | 22 +- l10n/ne/files.po | 80 ++--- l10n/nl/core.po | 22 +- l10n/nl/files.po | 80 ++--- l10n/nn_NO/core.po | 22 +- l10n/nn_NO/files.po | 80 ++--- l10n/oc/core.po | 22 +- l10n/oc/files.po | 80 ++--- l10n/pl/core.po | 22 +- l10n/pl/files.po | 84 ++--- l10n/pt_BR/core.po | 22 +- l10n/pt_BR/files.po | 80 ++--- l10n/pt_PT/core.po | 22 +- l10n/pt_PT/files.po | 80 ++--- l10n/ro/core.po | 22 +- l10n/ro/files.po | 84 ++--- l10n/ru/core.po | 22 +- l10n/ru/files.po | 84 ++--- l10n/si_LK/core.po | 22 +- l10n/si_LK/files.po | 80 ++--- l10n/sk/core.po | 22 +- l10n/sk/files.po | 84 ++--- l10n/sk_SK/core.po | 35 +- l10n/sk_SK/files.po | 84 ++--- l10n/sk_SK/files_encryption.po | 27 +- l10n/sk_SK/lib.po | 35 +- l10n/sk_SK/settings.po | 35 +- l10n/sk_SK/user_ldap.po | 15 +- l10n/sl/core.po | 22 +- l10n/sl/files.po | 88 +++-- l10n/sq/core.po | 22 +- l10n/sq/files.po | 80 ++--- l10n/sr/core.po | 22 +- l10n/sr/files.po | 84 ++--- l10n/sr@latin/core.po | 22 +- l10n/sr@latin/files.po | 84 ++--- l10n/sv/core.po | 34 +- l10n/sv/files.po | 80 ++--- l10n/sv/lib.po | 35 +- l10n/sv/user_ldap.po | 14 +- l10n/sw_KE/core.po | 22 +- l10n/sw_KE/files.po | 80 ++--- l10n/ta_LK/core.po | 22 +- l10n/ta_LK/files.po | 80 ++--- l10n/te/core.po | 22 +- l10n/te/files.po | 80 ++--- l10n/templates/core.pot | 20 +- l10n/templates/files.pot | 78 ++--- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 20 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 24 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/core.po | 22 +- l10n/th_TH/files.po | 76 ++-- l10n/tr/core.po | 22 +- l10n/tr/files.po | 80 ++--- l10n/ug/core.po | 22 +- l10n/ug/files.po | 76 ++-- l10n/uk/core.po | 22 +- l10n/uk/files.po | 84 ++--- l10n/ur_PK/core.po | 22 +- l10n/ur_PK/files.po | 80 ++--- l10n/vi/core.po | 22 +- l10n/vi/files.po | 76 ++-- l10n/zh_CN/core.po | 24 +- l10n/zh_CN/files.po | 76 ++-- l10n/zh_HK/core.po | 22 +- l10n/zh_HK/files.po | 76 ++-- l10n/zh_TW/core.po | 22 +- l10n/zh_TW/files.po | 76 ++-- lib/l10n/cs_CZ.php | 14 + lib/l10n/da.php | 14 + lib/l10n/de.php | 9 +- lib/l10n/de_DE.php | 10 + lib/l10n/en_GB.php | 69 ++++ lib/l10n/gl.php | 14 + lib/l10n/it.php | 13 + lib/l10n/sk_SK.php | 14 + lib/l10n/sv.php | 14 + settings/l10n/cs_CZ.php | 8 +- settings/l10n/de.php | 2 + settings/l10n/de_DE.php | 4 +- settings/l10n/en_GB.php | 124 +++++++ settings/l10n/gl.php | 2 + settings/l10n/sk_SK.php | 3 + 308 files changed, 7462 insertions(+), 4962 deletions(-) create mode 100644 core/l10n/en_GB.php create mode 100644 l10n/en_GB/core.po create mode 100644 l10n/en_GB/files.po create mode 100644 l10n/en_GB/files_encryption.po create mode 100644 l10n/en_GB/files_external.po create mode 100644 l10n/en_GB/files_sharing.po create mode 100644 l10n/en_GB/files_trashbin.po create mode 100644 l10n/en_GB/files_versions.po create mode 100644 l10n/en_GB/lib.po create mode 100644 l10n/en_GB/settings.po create mode 100644 l10n/en_GB/user_ldap.po create mode 100644 l10n/en_GB/user_webdavauth.po create mode 100644 lib/l10n/en_GB.php create mode 100644 settings/l10n/en_GB.php (limited to 'lib') diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index a6c4e65530c..8346eece88b 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "cancel" => "إلغاء", "replaced {new_name} with {old_name}" => "استبدل {new_name} بـ {old_name}", "undo" => "تراجع", +"_%n folder_::_%n folders_" => array("","","","","",""), +"_%n file_::_%n files_" => array("","","","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""), "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.", "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا", @@ -38,8 +40,6 @@ $TRANSLATIONS = array( "Name" => "اسم", "Size" => "حجم", "Modified" => "معدل", -"_%n folder_::_%n folders_" => array("","","","","",""), -"_%n file_::_%n files_" => array("","","","","",""), "Upload" => "رفع", "File handling" => "التعامل مع الملف", "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 1e2104370ba..e7dafd1c43a 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -17,12 +17,12 @@ $TRANSLATIONS = array( "replace" => "препокриване", "cancel" => "отказ", "undo" => "възтановяване", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Име", "Size" => "Размер", "Modified" => "Променено", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Качване", "Maximum upload size" => "Максимален размер за качване", "0 is unlimited" => "Ползвайте 0 за без ограничения", @@ -36,7 +36,6 @@ $TRANSLATIONS = array( "Delete" => "Изтриване", "Upload too large" => "Файлът който сте избрали за качване е прекалено голям", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.", -"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.", -"file" => "файл" +"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php index 9efde85f0ce..2265c232a14 100644 --- a/apps/files/l10n/bn_BD.php +++ b/apps/files/l10n/bn_BD.php @@ -27,6 +27,8 @@ $TRANSLATIONS = array( "cancel" => "বাতিল", "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে", "undo" => "ক্রিয়া প্রত্যাহার", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।", "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।", @@ -34,8 +36,6 @@ $TRANSLATIONS = array( "Name" => "রাম", "Size" => "আকার", "Modified" => "পরিবর্তিত", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "আপলোড", "File handling" => "ফাইল হ্যার্ডলিং", "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index f7d00692177..9f90138eebe 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancel·la", "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}", "undo" => "desfés", +"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), +"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), "files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Nom", "Size" => "Mida", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), -"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "%s could not be renamed" => "%s no es pot canviar el nom", "Upload" => "Puja", "File handling" => "Gestió de fitxers", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor", "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu", "Current scanning" => "Actualment escanejant", -"directory" => "directori", -"directories" => "directoris", -"file" => "fitxer", -"files" => "fitxers", "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index dd243eb5761..c46758c7bcc 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "zrušit", "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}", "undo" => "vrátit zpět", +"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"), +"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"), "files uploading" => "soubory se odesílají", "'.' is an invalid file name." => "'.' je neplatným názvem souboru.", @@ -39,13 +41,11 @@ $TRANSLATIONS = array( "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.", "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)", -"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.", "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.", "Name" => "Název", "Size" => "Velikost", "Modified" => "Upraveno", -"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"), -"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "%s could not be renamed" => "%s nemůže být přejmenován", "Upload" => "Odeslat", "File handling" => "Zacházení se soubory", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.", "Current scanning" => "Aktuální prohledávání", -"directory" => "adresář", -"directories" => "adresáře", -"file" => "soubor", -"files" => "soubory", "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index f614fbee47c..666e90e9db8 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "diddymu", "replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}", "undo" => "dadwneud", +"_%n folder_::_%n folders_" => array("","","",""), +"_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), "files uploading" => "ffeiliau'n llwytho i fyny", "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Enw", "Size" => "Maint", "Modified" => "Addaswyd", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), "Upload" => "Llwytho i fyny", "File handling" => "Trafod ffeiliau", "Maximum upload size" => "Maint mwyaf llwytho i fyny", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index a891bcfb378..36703322f93 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "fortryd", "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}", "undo" => "fortryd", +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"), "files uploading" => "uploader filer", "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Navn", "Size" => "Størrelse", "Modified" => "Ændret", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "%s kunne ikke omdøbes", "Upload" => "Upload", "File handling" => "Filhåndtering", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.", "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.", "Current scanning" => "Indlæser", -"directory" => "mappe", -"directories" => "Mapper", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 53f9b1a2364..8d8d30cb6e7 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "abbrechen", "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}", "undo" => "rückgängig machen", +"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), +"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "%s could not be renamed" => "%s konnte nicht umbenannt werden", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"directory" => "Verzeichnis", -"directories" => "Verzeichnisse", -"file" => "Datei", -"files" => "Dateien", "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 8ea824c9c1a..309a885d37f 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "abbrechen", "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", "undo" => "rückgängig machen", +"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), +"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "%s could not be renamed" => "%s konnte nicht umbenannt werden", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"directory" => "Verzeichnis", -"directories" => "Verzeichnisse", -"file" => "Datei", -"files" => "Dateien", "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 41645acb522..1dca8e41f6d 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -32,19 +32,20 @@ $TRANSLATIONS = array( "cancel" => "ακύρωση", "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}", "undo" => "αναίρεση", -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"), +"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"), +"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"), "files uploading" => "αρχεία ανεβαίνουν", "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.", "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.", "Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!", "Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις", "Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.", "Name" => "Όνομα", "Size" => "Μέγεθος", "Modified" => "Τροποποιήθηκε", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "Αδυναμία μετονομασίας του %s", "Upload" => "Μεταφόρτωση", "File handling" => "Διαχείριση αρχείων", @@ -70,10 +71,6 @@ $TRANSLATIONS = array( "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" => "Τρέχουσα ανίχνευση", -"directory" => "κατάλογος", -"directories" => "κατάλογοι", -"file" => "αρχείο", -"files" => "αρχεία", "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php index 83351f265f0..128f527aef1 100644 --- a/apps/files/l10n/en@pirate.php +++ b/apps/files/l10n/en@pirate.php @@ -1,8 +1,8 @@ array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Download" => "Download" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index 59ac4e1c398..2a011ab214b 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "nuligi", "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}", "undo" => "malfari", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "dosieroj estas alŝutataj", "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.", @@ -41,8 +43,6 @@ $TRANSLATIONS = array( "Name" => "Nomo", "Size" => "Grando", "Modified" => "Modifita", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Alŝuti", "File handling" => "Dosieradministro", "Maximum upload size" => "Maksimuma alŝutogrando", @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.", "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.", "Current scanning" => "Nuna skano", -"file" => "dosiero", -"files" => "dosieroj", "Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 415d23ae890..1ff1506aaf4 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}", "undo" => "deshacer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nombre", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s no se pudo renombrar", "Upload" => "Subir", "File handling" => "Manejo de archivos", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.", "Current scanning" => "Escaneo actual", -"directory" => "carpeta", -"directories" => "carpetas", -"file" => "archivo", -"files" => "archivos", "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index 4c0eb691f67..dac4d4e4de2 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}", "undo" => "deshacer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "Subiendo archivos", "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.", @@ -39,12 +41,11 @@ $TRANSLATIONS = array( "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.", "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando", "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.", "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.", "Name" => "Nombre", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "No se pudo renombrar %s", "Upload" => "Subir", "File handling" => "Tratamiento de archivos", @@ -70,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ", "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.", "Current scanning" => "Escaneo actual", -"directory" => "directorio", -"directories" => "directorios", -"file" => "archivo", -"files" => "archivos", "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 13198a9f881..e1947cb8f73 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "loobu", "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}", "undo" => "tagasi", +"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), +"_%n file_::_%n files_" => array("%n fail","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), "files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Nimi", "Size" => "Suurus", "Modified" => "Muudetud", -"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), -"_%n file_::_%n files_" => array("%n fail","%n faili"), "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus", "Upload" => "Lae üles", "File handling" => "Failide käsitlemine", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.", "Files are being scanned, please wait." => "Faile skannitakse, palun oota.", "Current scanning" => "Praegune skannimine", -"directory" => "kaust", -"directories" => "kaustad", -"file" => "fail", -"files" => "faili", "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 359b40ddefd..6c6e92dda38 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "ezeztatu", "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du", "undo" => "desegin", +"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), +"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"), "files uploading" => "fitxategiak igotzen", "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Izena", "Size" => "Tamaina", "Modified" => "Aldatuta", -"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), -"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "%s could not be renamed" => "%s ezin da berrizendatu", "Upload" => "Igo", "File handling" => "Fitxategien kudeaketa", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.", "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.", "Current scanning" => "Orain eskaneatzen ari da", -"directory" => "direktorioa", -"directories" => "direktorioak", -"file" => "fitxategia", -"files" => "fitxategiak", "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index e0b9fe02816..afa04e53ab2 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "لغو", "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.", "undo" => "بازگشت", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "بارگذاری فایل ها", "'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "نام", "Size" => "اندازه", "Modified" => "تاریخ", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.", "Upload" => "بارگزاری", "File handling" => "اداره پرونده ها", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد", "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید", "Current scanning" => "بازرسی کنونی", -"directory" => "پوشه", -"directories" => "پوشه ها", -"file" => "پرونده", -"files" => "پرونده ها", "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index b48f44665bc..d18ff4f0207 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "suggest name" => "ehdota nimeä", "cancel" => "peru", "undo" => "kumoa", +"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), +"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"), "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.", "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.", @@ -38,8 +40,6 @@ $TRANSLATIONS = array( "Name" => "Nimi", "Size" => "Koko", "Modified" => "Muokattu", -"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), -"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), "Upload" => "Lähetä", "File handling" => "Tiedostonhallinta", "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko", @@ -64,10 +64,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.", "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.", "Current scanning" => "Tämänhetkinen tutkinta", -"directory" => "kansio", -"directories" => "kansiota", -"file" => "tiedosto", -"files" => "tiedostoa", "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 44895eab28e..40bb81296e6 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annuler", "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}", "undo" => "annuler", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nom", "Size" => "Taille", "Modified" => "Modifié", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s ne peut être renommé", "Upload" => "Envoyer", "File handling" => "Gestion des fichiers", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.", "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.", "Current scanning" => "Analyse en cours", -"directory" => "dossier", -"directories" => "dossiers", -"file" => "fichier", -"files" => "fichiers", "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index c98263c08ff..2df738cb15f 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}", "undo" => "desfacer", +"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), +"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), "files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Nome", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), -"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "%s could not be renamed" => "%s non pode cambiar de nome", "Upload" => "Enviar", "File handling" => "Manexo de ficheiro", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor", "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.", "Current scanning" => "Análise actual", -"directory" => "directorio", -"directories" => "directorios", -"file" => "ficheiro", -"files" => "ficheiros", "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index ef98e2d2188..7141c8442e2 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -28,14 +28,14 @@ $TRANSLATIONS = array( "cancel" => "ביטול", "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}", "undo" => "ביטול", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "קבצים בהעלאה", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.", "Name" => "שם", "Size" => "גודל", "Modified" => "זמן שינוי", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "העלאה", "File handling" => "טיפול בקבצים", "Maximum upload size" => "גודל העלאה מקסימלי", @@ -57,8 +57,6 @@ $TRANSLATIONS = array( "Upload too large" => "העלאה גדולה מידי", "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" => "הסריקה הנוכחית", -"file" => "קובץ", -"files" => "קבצים" +"Current scanning" => "הסריקה הנוכחית" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php index 7fb5a5b09d3..7d2baab607d 100644 --- a/apps/files/l10n/hi.php +++ b/apps/files/l10n/hi.php @@ -2,9 +2,9 @@ $TRANSLATIONS = array( "Error" => "त्रुटि", "Share" => "साझा करें", -"_Uploading %n file_::_Uploading %n files_" => array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Save" => "सहेजें" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index 8f74dea092f..57f1ad9700b 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -18,13 +18,13 @@ $TRANSLATIONS = array( "suggest name" => "predloži ime", "cancel" => "odustani", "undo" => "vrati", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "datoteke se učitavaju", "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja promjena", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Učitaj", "File handling" => "datoteka za rukovanje", "Maximum upload size" => "Maksimalna veličina prijenosa", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "Upload too large" => "Prijenos je preobiman", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.", "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.", -"Current scanning" => "Trenutno skeniranje", -"file" => "datoteka", -"files" => "datoteke" +"Current scanning" => "Trenutno skeniranje" ); $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"; diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index e8d3b8c8676..741964503ff 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "mégse", "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}", "undo" => "visszavonás", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fájl töltődik föl", "'.' is an invalid file name." => "'.' fájlnév érvénytelen.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s átnevezése nem sikerült", "Upload" => "Feltöltés", "File handling" => "Fájlkezelés", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "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", -"directory" => "mappa", -"directories" => "mappa", -"file" => "fájl", -"files" => "fájlok", "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php index a419a74cc97..9a5ebb862a9 100644 --- a/apps/files/l10n/hy.php +++ b/apps/files/l10n/hy.php @@ -1,8 +1,8 @@ array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Save" => "Պահպանել", "Download" => "Բեռնել", "Delete" => "Ջնջել" diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php index 202375636a1..1560687f6c4 100644 --- a/apps/files/l10n/ia.php +++ b/apps/files/l10n/ia.php @@ -6,12 +6,12 @@ $TRANSLATIONS = array( "Files" => "Files", "Error" => "Error", "Share" => "Compartir", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Nomine", "Size" => "Dimension", "Modified" => "Modificate", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Incargar", "Maximum upload size" => "Dimension maxime de incargamento", "Save" => "Salveguardar", diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 84d9ba2020f..ce7cfe5ef4c 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "batalkan", "replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}", "undo" => "urungkan", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "berkas diunggah", "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Unggah", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran pengunggahan maksimum", @@ -66,8 +66,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.", "Current scanning" => "Yang sedang dipindai", -"file" => "berkas", -"files" => "berkas-berkas", "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php index 36116001bce..2cf195d0a11 100644 --- a/apps/files/l10n/is.php +++ b/apps/files/l10n/is.php @@ -27,6 +27,8 @@ $TRANSLATIONS = array( "cancel" => "hætta við", "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}", "undo" => "afturkalla", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.", "File name cannot be empty." => "Nafn skráar má ekki vera tómt", @@ -34,8 +36,6 @@ $TRANSLATIONS = array( "Name" => "Nafn", "Size" => "Stærð", "Modified" => "Breytt", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Senda inn", "File handling" => "Meðhöndlun skrár", "Maximum upload size" => "Hámarks stærð innsendingar", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 9be317fba99..2d53da21604 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annulla", "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}", "undo" => "annulla", +"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), +"_%n file_::_%n files_" => array("%n file","%n file"), "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"), "files uploading" => "caricamento file", "'.' is an invalid file name." => "'.' non è un nome file valido.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Nome", "Size" => "Dimensione", "Modified" => "Modificato", -"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), -"_%n file_::_%n files_" => array("%n file","%n file"), "%s could not be renamed" => "%s non può essere rinominato", "Upload" => "Carica", "File handling" => "Gestione file", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.", "Files are being scanned, please wait." => "Scansione dei file in corso, attendi", "Current scanning" => "Scansione corrente", -"directory" => "cartella", -"directories" => "cartelle", -"file" => "file", -"files" => "file", "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 902cc82e036..09675b63f51 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "キャンセル", "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換", "undo" => "元に戻す", +"_%n folder_::_%n folders_" => array("%n個のフォルダ"), +"_%n file_::_%n files_" => array("%n個のファイル"), "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"), "files uploading" => "ファイルをアップロード中", "'.' is an invalid file name." => "'.' は無効なファイル名です。", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "名前", "Size" => "サイズ", "Modified" => "変更", -"_%n folder_::_%n folders_" => array("%n個のフォルダ"), -"_%n file_::_%n files_" => array("%n個のファイル"), "%s could not be renamed" => "%sの名前を変更できませんでした", "Upload" => "アップロード", "File handling" => "ファイル操作", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "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" => "スキャン中", -"directory" => "ディレクトリ", -"directories" => "ディレクトリ", -"file" => "ファイル", -"files" => "ファイル", "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php index 527a2c49b1c..544e8168c54 100644 --- a/apps/files/l10n/ka.php +++ b/apps/files/l10n/ka.php @@ -1,9 +1,9 @@ "ფაილები", -"_Uploading %n file_::_Uploading %n files_" => array(""), "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), "Download" => "გადმოწერა" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 3e70d3294c1..8fd522aebcc 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "უარყოფა", "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით", "undo" => "დაბრუნება", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "ფაილები იტვირთება", "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "სახელი", "Size" => "ზომა", "Modified" => "შეცვლილია", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "ატვირთვა", "File handling" => "ფაილის დამუშავება", "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index f53c9e8e38e..86666c70569 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "취소", "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨", "undo" => "되돌리기", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "파일 업로드중", "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "이름", "Size" => "크기", "Modified" => "수정됨", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "업로드", "File handling" => "파일 처리", "Maximum upload size" => "최대 업로드 크기", @@ -66,8 +66,6 @@ $TRANSLATIONS = array( "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" => "현재 검색", -"file" => "파일", -"files" => "파일", "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php index 81177f9bea0..9ec565da441 100644 --- a/apps/files/l10n/ku_IQ.php +++ b/apps/files/l10n/ku_IQ.php @@ -2,10 +2,10 @@ $TRANSLATIONS = array( "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.", "Error" => "هه‌ڵه", -"_Uploading %n file_::_Uploading %n files_" => array("",""), -"Name" => "ناو", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), +"Name" => "ناو", "Upload" => "بارکردن", "Save" => "پاشکه‌وتکردن", "Folder" => "بوخچه", diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index c57eebd9e76..deefe9caa15 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -15,12 +15,12 @@ $TRANSLATIONS = array( "replace" => "ersetzen", "cancel" => "ofbriechen", "undo" => "réckgängeg man", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Numm", "Size" => "Gréisst", "Modified" => "Geännert", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Eroplueden", "File handling" => "Fichier handling", "Maximum upload size" => "Maximum Upload Gréisst ", @@ -41,8 +41,6 @@ $TRANSLATIONS = array( "Upload too large" => "Upload ze grouss", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.", "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.", -"Current scanning" => "Momentane Scan", -"file" => "Datei", -"files" => "Dateien" +"Current scanning" => "Momentane Scan" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index a4dd5008afb..3bcc6b84439 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "atšaukti", "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}", "undo" => "anuliuoti", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "įkeliami failai", "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", @@ -41,8 +43,6 @@ $TRANSLATIONS = array( "Name" => "Pavadinimas", "Size" => "Dydis", "Modified" => "Pakeista", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Įkelti", "File handling" => "Failų tvarkymas", "Maximum upload size" => "Maksimalus įkeliamo failo dydis", @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje", "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.", "Current scanning" => "Šiuo metu skenuojama", -"file" => "failas", -"files" => "failai", "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index b1435b46096..52cea5305d0 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "atcelt", "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}", "undo" => "atsaukt", +"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), +"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"), "files uploading" => "fails augšupielādējas", "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Nosaukums", "Size" => "Izmērs", "Modified" => "Mainīts", -"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), -"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "%s could not be renamed" => "%s nevar tikt pārsaukts", "Upload" => "Augšupielādēt", "File handling" => "Datņu pārvaldība", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu", "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.", "Current scanning" => "Šobrīd tiek caurskatīts", -"directory" => "direktorija", -"directories" => "direktorijas", -"file" => "fails", -"files" => "faili", "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index 20fed43ab20..7a9a8641f80 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -23,13 +23,13 @@ $TRANSLATIONS = array( "cancel" => "откажи", "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}", "undo" => "врати", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.", "Name" => "Име", "Size" => "Големина", "Modified" => "Променето", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Подигни", "File handling" => "Ракување со датотеки", "Maximum upload size" => "Максимална големина за подигање", @@ -51,8 +51,6 @@ $TRANSLATIONS = array( "Upload too large" => "Фајлот кој се вчитува е преголем", "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" => "Моментално скенирам", -"file" => "датотека", -"files" => "датотеки" +"Current scanning" => "Моментално скенирам" ); $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"; diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 86b70faefda..59d0bbfb339 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -15,12 +15,12 @@ $TRANSLATIONS = array( "Pending" => "Dalam proses", "replace" => "ganti", "cancel" => "Batal", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "Name" => "Nama", "Size" => "Saiz", "Modified" => "Dimodifikasi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Muat naik", "File handling" => "Pengendalian fail", "Maximum upload size" => "Saiz maksimum muat naik", @@ -40,8 +40,6 @@ $TRANSLATIONS = array( "Upload too large" => "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.", -"Current scanning" => "Imbasan semasa", -"file" => "fail", -"files" => "fail" +"Current scanning" => "Imbasan semasa" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php index 4dc63ffee2d..497ecc09492 100644 --- a/apps/files/l10n/my_MM.php +++ b/apps/files/l10n/my_MM.php @@ -1,9 +1,9 @@ "ဖိုင်များ", -"_Uploading %n file_::_Uploading %n files_" => array(""), "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), "Download" => "ဒေါင်းလုတ်" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 72c4153c6ef..5c7780825fb 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}", "undo" => "angre", +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"), "files uploading" => "filer lastes opp", "'.' is an invalid file name." => "'.' er et ugyldig filnavn.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Navn", "Size" => "Størrelse", "Modified" => "Endret", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "Kunne ikke gi nytt navn til %s", "Upload" => "Last opp", "File handling" => "Filhåndtering", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.", "Files are being scanned, please wait." => "Skanner filer, vennligst vent.", "Current scanning" => "Pågående skanning", -"directory" => "katalog", -"directories" => "kataloger", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 422fa8ba130..a4386992cf6 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annuleren", "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}", "undo" => "ongedaan maken", +"_%n folder_::_%n folders_" => array("","%n mappen"), +"_%n file_::_%n files_" => array("","%n bestanden"), "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"), "files uploading" => "bestanden aan het uploaden", "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Naam", "Size" => "Grootte", "Modified" => "Aangepast", -"_%n folder_::_%n folders_" => array("","%n mappen"), -"_%n file_::_%n files_" => array("","%n bestanden"), "%s could not be renamed" => "%s kon niet worden hernoemd", "Upload" => "Uploaden", "File handling" => "Bestand", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.", "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.", "Current scanning" => "Er wordt gescand", -"directory" => "directory", -"directories" => "directories", -"file" => "bestand", -"files" => "bestanden", "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index abaaa5ffe8e..84402057a3a 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}", "undo" => "angre", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "filer lastar opp", "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.", @@ -41,8 +43,6 @@ $TRANSLATIONS = array( "Name" => "Namn", "Size" => "Storleik", "Modified" => "Endra", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Last opp", "File handling" => "Filhandtering", "Maximum upload size" => "Maksimal opplastingsstorleik", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 552d72bef59..63e572059bf 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -18,13 +18,13 @@ $TRANSLATIONS = array( "suggest name" => "nom prepausat", "cancel" => "anulla", "undo" => "defar", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fichièrs al amontcargar", "Name" => "Nom", "Size" => "Talha", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Amontcarga", "File handling" => "Manejament de fichièr", "Maximum upload size" => "Talha maximum d'amontcargament", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "Upload too large" => "Amontcargament tròp gròs", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.", "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ", -"Current scanning" => "Exploracion en cors", -"file" => "fichièr", -"files" => "fichièrs" +"Current scanning" => "Exploracion en cors" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index d858248f29f..c55d81cea2f 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "anuluj", "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}", "undo" => "cofnij", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nazwa", "Size" => "Rozmiar", "Modified" => "Modyfikacja", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s nie można zmienić nazwy", "Upload" => "Wyślij", "File handling" => "Zarządzanie plikami", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.", "Current scanning" => "Aktualnie skanowane", -"directory" => "Katalog", -"directories" => "Katalogi", -"file" => "plik", -"files" => "pliki", "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index b42b81d040b..bfe34bab21f 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ", "undo" => "desfazer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s não pode ser renomeado", "Upload" => "Upload", "File handling" => "Tratamento de Arquivo", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.", "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.", "Current scanning" => "Scanning atual", -"directory" => "diretório", -"directories" => "diretórios", -"file" => "arquivo", -"files" => "arquivos", "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 50a33de6db3..8cd73a9f70c 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}", "undo" => "desfazer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "A enviar os ficheiros", "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s não pode ser renomeada", "Upload" => "Carregar", "File handling" => "Manuseamento de ficheiros", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.", "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.", "Current scanning" => "Análise actual", -"directory" => "diretório", -"directories" => "diretórios", -"file" => "ficheiro", -"files" => "ficheiros", "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 7c78c6f0767..3b5359384ac 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "anulare", "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}", "undo" => "Anulează ultima acțiune", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "fișiere se încarcă", "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s nu a putut fi redenumit", "Upload" => "Încărcare", "File handling" => "Manipulare fișiere", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.", "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.", "Current scanning" => "În curs de scanare", -"directory" => "catalog", -"directories" => "cataloage", -"file" => "fișier", -"files" => "fișiere", "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 782817be0ae..e0bf97038d4 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "отмена", "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}", "undo" => "отмена", +"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), +"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"), "files uploading" => "файлы загружаются", "'.' is an invalid file name." => "'.' - неправильное имя файла.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Имя", "Size" => "Размер", "Modified" => "Изменён", -"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), -"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), "%s could not be renamed" => "%s не может быть переименован", "Upload" => "Загрузка", "File handling" => "Управление файлами", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "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" => "Текущее сканирование", -"directory" => "директория", -"directories" => "директории", -"file" => "файл", -"files" => "файлы", "Upgrading filesystem cache..." => "Обновление кэша файловой системы..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index ffb28e09584..7d24370a092 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -18,12 +18,12 @@ $TRANSLATIONS = array( "suggest name" => "නමක් යෝජනා කරන්න", "cancel" => "අත් හරින්න", "undo" => "නිෂ්ප්‍රභ කරන්න", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "නම", "Size" => "ප්‍රමාණය", "Modified" => "වෙනස් කළ", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "උඩුගත කරන්න", "File handling" => "ගොනු පරිහරණය", "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "Upload too large" => "උඩුගත කිරීම විශාල වැඩිය", "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" => "වර්තමාන පරික්ෂාව", -"file" => "ගොනුව", -"files" => "ගොනු" +"Current scanning" => "වර්තමාන පරික්ෂාව" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 9c845794485..e7ade013792 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "zrušiť", "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}", "undo" => "vrátiť", +"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), +"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"), "files uploading" => "nahrávanie súborov", "'.' is an invalid file name." => "'.' je neplatné meno súboru.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Názov", "Size" => "Veľkosť", "Modified" => "Upravené", -"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), -"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "%s could not be renamed" => "%s nemohol byť premenovaný", "Upload" => "Odoslať", "File handling" => "Nastavenie správania sa k súborom", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.", "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.", "Current scanning" => "Práve prezerané", -"directory" => "priečinok", -"directories" => "priečinky", -"file" => "súbor", -"files" => "súbory", "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 79296c80492..6819ed3a3b3 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "prekliči", "replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}", "undo" => "razveljavi", +"_%n folder_::_%n folders_" => array("","","",""), +"_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), "files uploading" => "poteka pošiljanje datotek", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "Ime", "Size" => "Velikost", "Modified" => "Spremenjeno", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), "%s could not be renamed" => "%s ni bilo mogoče preimenovati", "Upload" => "Pošlji", "File handling" => "Upravljanje z datotekami", @@ -70,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...", "Current scanning" => "Trenutno poteka preučevanje", -"directory" => "direktorij", -"directories" => "direktoriji", -"file" => "datoteka", -"files" => "datoteke", "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..." ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index 838bcc5ef23..ff09e7b4f95 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "anulo", "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}", "undo" => "anulo", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "po ngarkoj skedarët", "'.' is an invalid file name." => "'.' është emër i pavlefshëm.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Emri", "Size" => "Dimensioni", "Modified" => "Modifikuar", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Ngarko", "File handling" => "Trajtimi i skedarit", "Maximum upload size" => "Dimensioni maksimal i ngarkimit", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index d4dcbd14ee5..b8cf91f4da6 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "откажи", "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}", "undo" => "опозови", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "датотеке се отпремају", "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Име", "Size" => "Величина", "Modified" => "Измењено", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Отпреми", "File handling" => "Управљање датотекама", "Maximum upload size" => "Највећа величина датотеке", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index bc7b11b8c53..1965479fe66 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -6,12 +6,12 @@ $TRANSLATIONS = array( "No file was uploaded" => "Nijedan fajl nije poslat", "Missing a temporary folder" => "Nedostaje privremena fascikla", "Files" => "Fajlovi", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja izmena", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Pošalji", "Maximum upload size" => "Maksimalna veličina pošiljke", "Save" => "Snimi", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index 0f72443a5f9..20bf77bb609 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}", "undo" => "ångra", +"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"), "files uploading" => "filer laddas upp", "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "Namn", "Size" => "Storlek", "Modified" => "Ändrad", -"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "%s kunde inte namnändras", "Upload" => "Ladda upp", "File handling" => "Filhantering", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.", "Files are being scanned, please wait." => "Filer skannas, var god vänta", "Current scanning" => "Aktuell skanning", -"directory" => "mapp", -"directories" => "mappar", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index eb39218e48d..fc52c16daf3 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -22,13 +22,13 @@ $TRANSLATIONS = array( "cancel" => "இரத்து செய்க", "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது", "undo" => "முன் செயல் நீக்கம் ", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.", "Name" => "பெயர்", "Size" => "அளவு", "Modified" => "மாற்றப்பட்டது", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "பதிவேற்றுக", "File handling" => "கோப்பு கையாளுதல்", "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ", diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php index 5a108274dd9..60aabc8a365 100644 --- a/apps/files/l10n/te.php +++ b/apps/files/l10n/te.php @@ -3,11 +3,11 @@ $TRANSLATIONS = array( "Error" => "పొరపాటు", "Delete permanently" => "శాశ్వతంగా తొలగించు", "cancel" => "రద్దుచేయి", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "పేరు", "Size" => "పరిమాణం", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Save" => "భద్రపరచు", "Folder" => "సంచయం", "Delete" => "తొలగించు" diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index ac2da6aed91..b65c0bc705e 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "cancel" => "ยกเลิก", "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว", "undo" => "เลิกทำ", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "การอัพโหลดไฟล์", "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง", @@ -39,8 +41,6 @@ $TRANSLATIONS = array( "Name" => "ชื่อ", "Size" => "ขนาด", "Modified" => "แก้ไขแล้ว", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "อัพโหลด", "File handling" => "การจัดกาไฟล์", "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้", @@ -63,8 +63,6 @@ $TRANSLATIONS = array( "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" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้", -"file" => "ไฟล์", -"files" => "ไฟล์", "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 650e4ead88c..d317b11d532 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "iptal", "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi", "undo" => "geri al", +"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), +"_%n file_::_%n files_" => array("%n dosya","%n dosya"), "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"), "files uploading" => "Dosyalar yükleniyor", "'.' is an invalid file name." => "'.' geçersiz dosya adı.", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "İsim", "Size" => "Boyut", "Modified" => "Değiştirilme", -"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), -"_%n file_::_%n files_" => array("%n dosya","%n dosya"), "%s could not be renamed" => "%s yeniden adlandırılamadı", "Upload" => "Yükle", "File handling" => "Dosya taşıma", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.", "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.", "Current scanning" => "Güncel tarama", -"directory" => "dizin", -"directories" => "dizinler", -"file" => "dosya", -"files" => "dosyalar", "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php index 2eceeea44a8..920d077e4eb 100644 --- a/apps/files/l10n/ug.php +++ b/apps/files/l10n/ug.php @@ -20,13 +20,13 @@ $TRANSLATIONS = array( "suggest name" => "تەۋسىيە ئات", "cancel" => "ۋاز كەچ", "undo" => "يېنىۋال", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ", "Name" => "ئاتى", "Size" => "چوڭلۇقى", "Modified" => "ئۆزگەرتكەن", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "يۈكلە", "Save" => "ساقلا", "New" => "يېڭى", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 49747caef19..79a18231d2c 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "відміна", "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}", "undo" => "відмінити", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "файли завантажуються", "'.' is an invalid file name." => "'.' це невірне ім'я файлу.", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Ім'я", "Size" => "Розмір", "Modified" => "Змінено", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s не може бути перейменований", "Upload" => "Вивантажити", "File handling" => "Робота з файлами", @@ -67,10 +67,6 @@ $TRANSLATIONS = array( "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" => "Поточне сканування", -"directory" => "каталог", -"directories" => "каталоги", -"file" => "файл", -"files" => "файли", "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php index 15c24700df0..6854c421587 100644 --- a/apps/files/l10n/ur_PK.php +++ b/apps/files/l10n/ur_PK.php @@ -1,9 +1,9 @@ "ایرر", -"_Uploading %n file_::_Uploading %n files_" => array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Unshare" => "شئیرنگ ختم کریں" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index 9c6e1c2a57b..02b184d218c 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "hủy", "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}", "undo" => "lùi lại", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "tệp tin đang được tải lên", "'.' is an invalid file name." => "'.' là một tên file không hợp lệ", @@ -40,8 +42,6 @@ $TRANSLATIONS = array( "Name" => "Tên", "Size" => "Kích cỡ", "Modified" => "Thay đổi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Tải lên", "File handling" => "Xử lý tập tin", "Maximum upload size" => "Kích thước tối đa ", @@ -66,8 +66,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.", "Current scanning" => "Hiện tại đang quét", -"file" => "file", -"files" => "files", "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index ad9733f059a..fa2e3403f4b 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "取消", "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}", "undo" => "撤销", +"_%n folder_::_%n folders_" => array("%n 文件夹"), +"_%n file_::_%n files_" => array("%n个文件"), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "文件上传中", "'.' is an invalid file name." => "'.' 是一个无效的文件名。", @@ -43,8 +45,6 @@ $TRANSLATIONS = array( "Name" => "名称", "Size" => "大小", "Modified" => "修改日期", -"_%n folder_::_%n folders_" => array("%n 文件夹"), -"_%n file_::_%n files_" => array("%n个文件"), "%s could not be renamed" => "%s 不能被重命名", "Upload" => "上传", "File handling" => "文件处理", @@ -70,8 +70,6 @@ $TRANSLATIONS = array( "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" => "当前扫描", -"file" => "文件", -"files" => "文件", "Upgrading filesystem cache..." => "正在更新文件系统缓存..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php index a9064fa7f78..febed4fe8fb 100644 --- a/apps/files/l10n/zh_HK.php +++ b/apps/files/l10n/zh_HK.php @@ -3,10 +3,10 @@ $TRANSLATIONS = array( "Files" => "文件", "Error" => "錯誤", "Share" => "分享", -"_Uploading %n file_::_Uploading %n files_" => array(""), -"Name" => "名稱", "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), +"Name" => "名稱", "Upload" => "上傳", "Save" => "儲存", "Download" => "下載", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 5cca3e0fd85..6ba8bf35de8 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "取消", "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}", "undo" => "復原", +"_%n folder_::_%n folders_" => array("%n 個資料夾"), +"_%n file_::_%n files_" => array("%n 個檔案"), "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"), "files uploading" => "檔案正在上傳中", "'.' is an invalid file name." => "'.' 是不合法的檔名。", @@ -44,8 +46,6 @@ $TRANSLATIONS = array( "Name" => "名稱", "Size" => "大小", "Modified" => "修改", -"_%n folder_::_%n folders_" => array("%n 個資料夾"), -"_%n file_::_%n files_" => array("%n 個檔案"), "%s could not be renamed" => "無法重新命名 %s", "Upload" => "上傳", "File handling" => "檔案處理", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "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" => "目前掃描", -"directory" => "目錄", -"directories" => "目錄", -"file" => "檔案", -"files" => "檔案", "Upgrading filesystem cache..." => "正在升級檔案系統快取..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php index a723d80773b..a80eb3e6521 100644 --- a/apps/files_encryption/l10n/sk_SK.php +++ b/apps/files_encryption/l10n/sk_SK.php @@ -8,12 +8,22 @@ $TRANSLATIONS = array( "Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", "Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.", "Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.", +"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom.", +"Missing requirements." => "Chýbajúce požiadavky.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.", +"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:", "Saving..." => "Ukladám...", "Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.", +"You can unlock your private key in your " => "Môžte odomknúť váš privátny kľúč v", "personal settings" => "osobné nastavenia", "Encryption" => "Šifrovanie", +"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):", +"Recovery key password" => "Heslo obnovovacieho kľúča", "Enabled" => "Povolené", "Disabled" => "Zakázané", +"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:", +"Old Recovery key password" => "Staré heslo obnovovacieho kľúča", +"New Recovery key password" => "Nové heslo obnovovacieho kľúča", "Change Password" => "Zmeniť heslo", "Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:", "Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.", diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php index 759e5299e42..939c7fed614 100644 --- a/apps/files_trashbin/l10n/el.php +++ b/apps/files_trashbin/l10n/el.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Μόνιμη διαγραφή", "Name" => "Όνομα", "Deleted" => "Διαγράφηκε", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n φάκελοι"), +"_%n file_::_%n files_" => array("","%n αρχεία"), "restored" => "έγινε επαναφορά", "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!", "Restore" => "Επαναφορά", diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 9f4c31c068b..9109a8c710a 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -30,11 +30,11 @@ $TRANSLATIONS = array( "Password" => "Heslo", "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.", "User Login Filter" => "Filtr přihlášení uživatelů", -"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"", "User List Filter" => "Filtr seznamu uživatelů", -"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"", "Group Filter" => "Filtr skupin", -"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"", "Connection Settings" => "Nastavení spojení", "Configuration Active" => "Nastavení aktivní", "When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.", diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php index c5bb6a8a50c..df71a71e933 100644 --- a/apps/user_ldap/l10n/sk_SK.php +++ b/apps/user_ldap/l10n/sk_SK.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Heslo", "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.", "User Login Filter" => "Filter prihlásenia používateľov", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"", "User List Filter" => "Filter zoznamov používateľov", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"", "Group Filter" => "Filter skupiny", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"", "Connection Settings" => "Nastavenie pripojenia", "Configuration Active" => "Nastavenia sú aktívne ", "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.", "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)", "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.", "Cache Time-To-Live" => "Životnosť objektov v cache", "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.", "Directory Settings" => "Nastavenie priečinka", diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index c7fb33195d7..3288438c09b 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Lösenord", "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.", "User Login Filter" => "Filter logga in användare", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"", "User List Filter" => "Filter lista användare", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"", "Group Filter" => "Gruppfilter", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"", "Connection Settings" => "Uppkopplingsinställningar", "Configuration Active" => "Konfiguration aktiv", "When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.", "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)", "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.", "Cache Time-To-Live" => "Cache Time-To-Live", "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.", "Directory Settings" => "Mappinställningar", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index abff5bbbdb4..c389ad01883 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Acaba la configuració", "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.", "Log out" => "Surt", -"More apps" => "Més aplicacions", "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!", "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!", "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 78614eef0e7..d104a9fbe80 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -1,6 +1,12 @@ "%s s vámi sdílí »%s«", +"Turned on maintenance mode" => "Zapnut režim údržby", +"Turned off maintenance mode" => "Vypnut režim údržby", +"Updated database" => "Zaktualizována databáze", +"Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...", +"Updated filecache" => "Aktualizována souborová mezipaměť", +"... %d%% done ..." => "... %d%% dokončeno ...", "Category type not provided." => "Nezadán typ kategorie.", "No category to add?" => "Žádná kategorie k přidání?", "This category already exists: %s" => "Kategorie již existuje: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Dokončit nastavení", "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.", "Log out" => "Odhlásit se", -"More apps" => "Více aplikací", "Automatic logon rejected!" => "Automatické přihlášení odmítnuto!", "If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!", "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 916975393b7..5a1fe65f441 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Afslut opsætning", "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.", "Log out" => "Log ud", -"More apps" => "Flere programmer", "Automatic logon rejected!" => "Automatisk login afvist!", "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!", "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.", diff --git a/core/l10n/de.php b/core/l10n/de.php index 300edb9141d..655305488f3 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschließen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!", "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!", "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.", diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php index c0e3e80f0a3..93c8e33f3e2 100644 --- a/core/l10n/de_AT.php +++ b/core/l10n/de_AT.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("",""), -"More apps" => "Mehr Apps" +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index d93158c62de..2dde9eb5367 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschliessen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "Automatic logon rejected!" => "Automatische Anmeldung verweigert!", "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!", "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index d70dd6e99d9..1311a76d693 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschließen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "Automatic logon rejected!" => "Automatische Anmeldung verweigert!", "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!", "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php new file mode 100644 index 00000000000..3a42872366a --- /dev/null +++ b/core/l10n/en_GB.php @@ -0,0 +1,146 @@ + "%s shared \"%s\" with you", +"group" => "group", +"Turned on maintenance mode" => "Turned on maintenance mode", +"Turned off maintenance mode" => "Turned off maintenance mode", +"Updated database" => "Updated database", +"Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...", +"Updated filecache" => "Updated filecache", +"... %d%% done ..." => "... %d%% done ...", +"Category type not provided." => "Category type not provided.", +"No category to add?" => "No category to add?", +"This category already exists: %s" => "This category already exists: %s", +"Object type not provided." => "Object type not provided.", +"%s ID not provided." => "%s ID not provided.", +"Error adding %s to favorites." => "Error adding %s to favourites.", +"No categories selected for deletion." => "No categories selected for deletion.", +"Error removing %s from favorites." => "Error removing %s from favourites.", +"Sunday" => "Sunday", +"Monday" => "Monday", +"Tuesday" => "Tuesday", +"Wednesday" => "Wednesday", +"Thursday" => "Thursday", +"Friday" => "Friday", +"Saturday" => "Saturday", +"January" => "January", +"February" => "February", +"March" => "March", +"April" => "April", +"May" => "May", +"June" => "June", +"July" => "July", +"August" => "August", +"September" => "September", +"October" => "October", +"November" => "November", +"December" => "December", +"Settings" => "Settings", +"seconds ago" => "seconds ago", +"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"), +"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"), +"today" => "today", +"yesterday" => "yesterday", +"_%n day ago_::_%n days ago_" => array("%n day ago","%n days ago"), +"last month" => "last month", +"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"), +"months ago" => "months ago", +"last year" => "last year", +"years ago" => "years ago", +"Choose" => "Choose", +"Error loading file picker template" => "Error loading file picker template", +"Yes" => "Yes", +"No" => "No", +"Ok" => "OK", +"The object type is not specified." => "The object type is not specified.", +"Error" => "Error", +"The app name is not specified." => "The app name is not specified.", +"The required file {file} is not installed!" => "The required file {file} is not installed!", +"Shared" => "Shared", +"Share" => "Share", +"Error while sharing" => "Error whilst sharing", +"Error while unsharing" => "Error whilst unsharing", +"Error while changing permissions" => "Error whilst changing permissions", +"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}", +"Shared with you by {owner}" => "Shared with you by {owner}", +"Share with" => "Share with", +"Share with link" => "Share with link", +"Password protect" => "Password protect", +"Password" => "Password", +"Allow Public Upload" => "Allow Public Upload", +"Email link to person" => "Email link to person", +"Send" => "Send", +"Set expiration date" => "Set expiration date", +"Expiration date" => "Expiration date", +"Share via email:" => "Share via email:", +"No people found" => "No people found", +"Resharing is not allowed" => "Resharing is not allowed", +"Shared in {item} with {user}" => "Shared in {item} with {user}", +"Unshare" => "Unshare", +"can edit" => "can edit", +"access control" => "access control", +"create" => "create", +"update" => "update", +"delete" => "delete", +"share" => "share", +"Password protected" => "Password protected", +"Error unsetting expiration date" => "Error unsetting expiration date", +"Error setting expiration date" => "Error setting expiration date", +"Sending ..." => "Sending ...", +"Email sent" => "Email sent", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "The update was unsuccessful. Please report this issue to the ownCloud community.", +"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.", +"%s password reset" => "%s password reset", +"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}", +"The link to reset your password has been sent to your email.
    If you do not receive it within a reasonable amount of time, check your spam/junk folders.
    If it is not there ask your local administrator ." => "The link to reset your password has been sent to your email.
    If you do not receive it within a reasonable amount of time, check your spam/junk folders.
    If it is not there ask your local administrator .", +"Request failed!
    Did you make sure your email/username was right?" => "Request failed!
    Did you make sure your email/username was correct?", +"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.", +"Username" => "Username", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", +"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now", +"Request reset" => "Request reset", +"Your password was reset" => "Your password was reset", +"To login page" => "To login page", +"New password" => "New password", +"Reset password" => "Reset password", +"Personal" => "Personal", +"Users" => "Users", +"Apps" => "Apps", +"Admin" => "Admin", +"Help" => "Help", +"Access forbidden" => "Access denied", +"Cloud not found" => "Cloud not found", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", +"Edit categories" => "Edit categories", +"Add" => "Add", +"Security Warning" => "Security Warning", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No secure random number generator is available, please enable the PHP OpenSSL extension.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.", +"For information how to properly configure your server, please see the documentation." => "For information how to properly configure your server, please see the documentation.", +"Create an admin account" => "Create an admin account", +"Advanced" => "Advanced", +"Data folder" => "Data folder", +"Configure the database" => "Configure the database", +"will be used" => "will be used", +"Database user" => "Database user", +"Database password" => "Database password", +"Database name" => "Database name", +"Database tablespace" => "Database tablespace", +"Database host" => "Database host", +"Finish setup" => "Finish setup", +"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.", +"Log out" => "Log out", +"Automatic logon rejected!" => "Automatic logon rejected!", +"If you did not change your password recently, your account may be compromised!" => "If you did not change your password recently, your account may be compromised!", +"Please change your password to secure your account again." => "Please change your password to secure your account again.", +"Lost your password?" => "Lost your password?", +"remember" => "remember", +"Log in" => "Log in", +"Alternative Logins" => "Alternative Logins", +"Hey there,

    just letting you know that %s shared »%s« with you.
    View it!

    Cheers!" => "Hey there,

    just letting you know that %s shared \"%s\" with you.
    View it!

    Cheers!", +"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index d9e57503817..d9d007819d3 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Lõpeta seadistamine", "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.", "Log out" => "Logi välja", -"More apps" => "Rohkem rakendusi", "Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!", "If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!", "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 83b8fca1eab..ae241e93873 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Bukatu konfigurazioa", "%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.", "Log out" => "Saioa bukatu", -"More apps" => "App gehiago", "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!", "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!", "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index dc603cf41de..7efeaa1fac2 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Viimeistele asennus", "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.", "Log out" => "Kirjaudu ulos", -"More apps" => "Lisää sovelluksia", "Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!", "If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.", "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 9db68bbbd05..56027e4cf1a 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,6 +1,12 @@ "%s compartiu «%s» con vostede", +"Turned on maintenance mode" => "Modo de mantemento activado", +"Turned off maintenance mode" => "Modo de mantemento desactivado", +"Updated database" => "Base de datos actualizada", +"Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...", +"Updated filecache" => "Ficheiro da caché actualizado", +"... %d%% done ..." => "... %d%% feito ...", "Category type not provided." => "Non se indicou o tipo de categoría", "No category to add?" => "Sen categoría que engadir?", "This category already exists: %s" => "Esta categoría xa existe: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Rematar a configuración", "%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.", "Log out" => "Desconectar", -"More apps" => "Máis aplicativos", "Automatic logon rejected!" => "Rexeitouse a entrada automática", "If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!", "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.", diff --git a/core/l10n/he.php b/core/l10n/he.php index c9c6e1f7507..b197a67b116 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -122,7 +122,6 @@ $TRANSLATIONS = array( "Finish setup" => "סיום התקנה", "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.", "Log out" => "התנתקות", -"More apps" => "יישומים נוספים", "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." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.", diff --git a/core/l10n/it.php b/core/l10n/it.php index 8c09b4e90fb..63a7545d891 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,6 +1,12 @@ "%s ha condiviso «%s» con te", +"Turned on maintenance mode" => "Modalità di manutenzione attivata", +"Turned off maintenance mode" => "Modalità di manutenzione disattivata", +"Updated database" => "Database aggiornato", +"Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...", +"Updated filecache" => "Cache dei file aggiornata", +"... %d%% done ..." => "... %d%% completato ...", "Category type not provided." => "Tipo di categoria non fornito.", "No category to add?" => "Nessuna categoria da aggiungere?", "This category already exists: %s" => "Questa categoria esiste già: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Termina la configurazione", "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.", "Log out" => "Esci", -"More apps" => "Altre applicazioni", "Automatic logon rejected!" => "Accesso automatico rifiutato.", "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.", "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 31d2f92eff2..2ab85f13d30 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "セットアップを完了します", "%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。", "Log out" => "ログアウト", -"More apps" => "他のアプリ", "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." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 84678c1c208..5db8f6c21a9 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -121,7 +121,6 @@ $TRANSLATIONS = array( "Finish setup" => "Baigti diegimą", "%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.", "Log out" => "Atsijungti", -"More apps" => "Daugiau programų", "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!", "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!", "Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 6deb5dfda9f..ddfc6008983 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Pabeigt iestatīšanu", "%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.", "Log out" => "Izrakstīties", -"More apps" => "Vairāk programmu", "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!", "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.", "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 46375756de4..6a2d1a03a10 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installatie afronden", "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.", "Log out" => "Afmelden", -"More apps" => "Meer applicaties", "Automatic logon rejected!" => "Automatische aanmelding geweigerd!", "If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!", "Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 9be10f535b7..1188e555316 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -125,7 +125,6 @@ $TRANSLATIONS = array( "Finish setup" => "Zakończ konfigurowanie", "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.", "Log out" => "Wyloguj", -"More apps" => "Więcej aplikacji", "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!", "If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!", "Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 8446e5270a7..8db5262e94b 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Concluir configuração", "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.", "Log out" => "Sair", -"More apps" => "Mais aplicativos", "Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!", "If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!", "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 8c29c8d26f6..503ca579ce7 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Завершить установку", "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.", "Log out" => "Выйти", -"More apps" => "Ещё приложения", "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." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 5fff18e7d6f..82745d617e9 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,6 +1,12 @@ "%s s Vami zdieľa »%s«", +"Turned on maintenance mode" => "Mód údržby zapnutý", +"Turned off maintenance mode" => "Mód údržby vypnutý", +"Updated database" => "Databáza aktualizovaná", +"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...", +"Updated filecache" => "\"Filecache\" aktualizovaná", +"... %d%% done ..." => "... %d%% dokončených ...", "Category type not provided." => "Neposkytnutý typ kategórie.", "No category to add?" => "Žiadna kategória pre pridanie?", "This category already exists: %s" => "Kategória: %s už existuje.", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Dokončiť inštaláciu", "%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.", "Log out" => "Odhlásiť", -"More apps" => "Viac aplikácií", "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!", "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.", "Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index cda76a520b4..74d285a35a6 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -1,6 +1,12 @@ "%s delade »%s« med dig", +"Turned on maintenance mode" => "Aktiverade underhållsläge", +"Turned off maintenance mode" => "Deaktiverade underhållsläge", +"Updated database" => "Uppdaterade databasen", +"Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...", +"Updated filecache" => "Uppdaterade filcache", +"... %d%% done ..." => "... %d%% klart ...", "Category type not provided." => "Kategorityp inte angiven.", "No category to add?" => "Ingen kategori att lägga till?", "This category already exists: %s" => "Denna kategori finns redan: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Avsluta installation", "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.", "Log out" => "Logga ut", -"More apps" => "Fler appar", "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!", "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!", "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index dde8a1bd97a..6dd54057950 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Kurulumu tamamla", "%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.", "Log out" => "Çıkış yap", -"More apps" => "Daha fazla Uygulama", "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!", "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.", "Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 5784d828c17..08d70dfee66 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "安装完成", "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。", "Log out" => "注销", -"More apps" => "更多应用", "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." => "请修改您的密码，以保护您的账户安全。", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index e1493452d86..fabec7537d1 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "完成設定", "%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。", "Log out" => "登出", -"More apps" => "更多 Apps", "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." => "請更改您的密碼以再次取得您帳戶的控制權。", diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index aedec216127..bf1d8334e31 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "Persoonlik" msgid "Users" msgstr "Gebruikers" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Toepassings" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "Teken uit" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Jou wagwoord verloor?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "onthou" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Teken aan" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po index 460b687ed7d..e02365d6370 100644 --- a/l10n/af_ZA/files.po +++ b/l10n/af_ZA/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 6ff2f20122a..c9594857940 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -483,7 +487,7 @@ msgstr "شخصي" msgid "Users" msgstr "المستخدمين" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "التطبيقات" @@ -616,10 +620,6 @@ msgstr "" msgid "Log out" msgstr "الخروج" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "تم رفض تسجيل الدخول التلقائي!" @@ -634,19 +634,19 @@ msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تع msgid "Please change your password to secure your account again." msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "هل نسيت كلمة السر؟" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "تذكر" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "أدخل" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "اسماء دخول بديلة" diff --git a/l10n/ar/files.po b/l10n/ar/files.po index c814f86a38a..b8086649e4a 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "خطأ في الكتابة على القرص الصلب" msgid "Not enough storage available" msgstr "لا يوجد مساحة تخزينية كافية" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "مسار غير صحيح." @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "تم إلغاء عملية رفع الملفات ." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "عنوان ال URL لا يجوز أن يكون فارغا." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "خطأ" @@ -123,35 +127,59 @@ msgstr "حذف بشكل دائم" msgid "Rename" msgstr "إعادة تسميه" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "قيد الانتظار" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} موجود مسبقا" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "استبدال" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "اقترح إسم" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "إلغاء" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "استبدل {new_name} بـ {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "تراجع" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -161,7 +189,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -211,26 +239,6 @@ msgstr "حجم" msgid "Modified" msgstr "معدل" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -334,22 +342,6 @@ msgstr "يرجى الانتظار , جاري فحص الملفات ." msgid "Current scanning" msgstr "الفحص الحالي" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "تحديث ذاكرة التخزين المؤقت(الكاش) الخاصة بملفات النظام ..." diff --git a/l10n/be/core.po b/l10n/be/core.po index c474afadeee..5f2b7f50b2e 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -475,7 +479,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -608,10 +612,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -626,19 +626,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/be/files.po b/l10n/be/files.po index 69819ec5ac3..ef6881506f8 100644 --- a/l10n/be/files.po +++ b/l10n/be/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,35 +127,55 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -159,7 +183,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -209,22 +233,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -328,22 +336,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 641f5322a74..b95f90370d7 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "Лични" msgid "Users" msgstr "Потребители" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Приложения" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "Изход" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Забравена парола?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "запомни" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Вход" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 033c103f0e5..a57ea88b76f 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Възникна проблем при запис в диска" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Невалидна директория." @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Качването е спряно." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Грешка" @@ -123,41 +127,57 @@ msgstr "Изтриване завинаги" msgid "Rename" msgstr "Преименуване" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Чакащо" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "препокриване" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "отказ" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "възтановяване" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "Размер" msgid "Modified" msgstr "Променено" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Файловете се претърсват, изчакайте." msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "файл" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 2211ac2ee42..9be574c0eb7 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "ব্যক্তিগত" msgid "Users" msgstr "ব্যবহারকারী" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "অ্যাপ" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "প্রস্থান" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "কূটশব্দ হারিয়েছেন?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "মনে রাখ" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "প্রবেশ" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index 0422f92b575..de8d7478780 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "ডিস্কে লিখতে ব্যর্থ" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "ভুল ডিরেক্টরি" @@ -94,20 +98,20 @@ msgstr "যথেষ্ঠ পরিমাণ স্থান নেই" msgid "Upload cancelled." msgstr "আপলোড বাতিল করা হয়েছে।" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL ফাঁকা রাখা যাবে না।" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "সমস্যা" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "পূনঃনামকরণ" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "মুলতুবি" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} টি বিদ্যমান" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "প্রতিস্থাপন" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "নাম সুপারিশ করুন" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "বাতিল" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "ক্রিয়া প্রত্যাহার" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "আকার" msgid "Modified" msgstr "পরিবর্তিত" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে msgid "Current scanning" msgstr "বর্তমান স্ক্যানিং" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/bs/core.po b/l10n/bs/core.po index 4a81d1ca6f0..cb3399fb366 100644 --- a/l10n/bs/core.po +++ b/l10n/bs/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -622,19 +622,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/bs/files.po b/l10n/bs/files.po index 29f748a5dc2..6c304b92899 100644 --- a/l10n/bs/files.po +++ b/l10n/bs/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,42 +127,60 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -208,20 +230,6 @@ msgstr "Veličina" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6b7141c49c7..21836c30a8b 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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s ha compartit »%s« amb tu" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Personal" msgid "Users" msgstr "Usuaris" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicacions" @@ -602,10 +606,6 @@ msgstr "%s està disponible. Obtingueu més informació de com actualitzar." msgid "Log out" msgstr "Surt" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Més aplicacions" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "L'ha rebutjat l'acceditació automàtica!" @@ -620,19 +620,19 @@ msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar c msgid "Please change your password to secure your account again." msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Heu perdut la contrasenya?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "recorda'm" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Inici de sessió" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Acreditacions alternatives" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 66e2e24f2ab..8bedc7b3618 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Ha fallat en escriure al disc" msgid "Not enough storage available" msgstr "No hi ha prou espai disponible" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Directori no vàlid." @@ -96,20 +100,20 @@ msgstr "No hi ha prou espai disponible" msgid "Upload cancelled." msgstr "La pujada s'ha cancel·lat." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "La URL no pot ser buida" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Error" @@ -125,41 +129,57 @@ msgstr "Esborra permanentment" msgid "Rename" msgstr "Reanomena" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendent" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} ja existeix" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "substitueix" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugereix un nom" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancel·la" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "s'ha substituït {old_name} per {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "desfés" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n carpeta" +msgstr[1] "%n carpetes" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n fitxer" +msgstr[1] "%n fitxers" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Pujant %n fitxer" msgstr[1] "Pujant %n fitxers" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fitxers pujant" @@ -209,18 +229,6 @@ msgstr "Mida" msgid "Modified" msgstr "Modificat" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n carpeta" -msgstr[1] "%n carpetes" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n fitxer" -msgstr[1] "%n fitxers" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "S'estan escanejant els fitxers, espereu" msgid "Current scanning" msgstr "Actualment escanejant" -#: templates/part.list.php:74 -msgid "directory" -msgstr "directori" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "directoris" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fitxer" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fitxers" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Actualitzant la memòria de cau del sistema de fitxers..." diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 976d3cfdb5f..41edc0ee8a0 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -27,30 +27,34 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s s vámi sdílí »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Zapnut režim údržby" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Vypnut režim údržby" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Zaktualizována databáze" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Aktualizována souborová mezipaměť" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% dokončeno ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -476,7 +480,7 @@ msgstr "Osobní" msgid "Users" msgstr "Uživatelé" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikace" @@ -609,10 +613,6 @@ msgstr "%s je dostupná. Získejte více informací k postupu aktualizace." msgid "Log out" msgstr "Odhlásit se" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Více aplikací" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatické přihlášení odmítnuto!" @@ -627,19 +627,19 @@ msgstr "Pokud jste v nedávné době neměnili své heslo, Váš účet může b msgid "Please change your password to secure your account again." msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ztratili jste své heslo?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "zapamatovat" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Přihlásit" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternativní přihlášení" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 9659af9c1d9..94cdb7b62b6 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -78,7 +78,11 @@ msgstr "Zápis na disk selhal" msgid "Not enough storage available" msgstr "Nedostatek dostupného úložného prostoru" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Neplatný adresář" @@ -98,20 +102,20 @@ msgstr "Nedostatek volného místa" msgid "Upload cancelled." msgstr "Odesílání zrušeno." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL nemůže být prázdná." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Chyba" @@ -127,42 +131,60 @@ msgstr "Trvale odstranit" msgid "Rename" msgstr "Přejmenovat" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Nevyřízené" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} již existuje" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "nahradit" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "navrhnout název" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "zrušit" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "nahrazeno {new_name} s {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "vrátit zpět" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n složka" +msgstr[1] "%n složky" +msgstr[2] "%n složek" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n soubor" +msgstr[1] "%n soubory" +msgstr[2] "%n souborů" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávám %n soubor" msgstr[1] "Nahrávám %n soubory" msgstr[2] "Nahrávám %n souborů" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "soubory se odesílají" @@ -192,7 +214,7 @@ msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete." +msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete." #: js/files.js:245 msgid "" @@ -212,20 +234,6 @@ msgstr "Velikost" msgid "Modified" msgstr "Upraveno" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n složka" -msgstr[1] "%n složky" -msgstr[2] "%n složek" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n soubor" -msgstr[1] "%n soubory" -msgstr[2] "%n souborů" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -329,22 +337,6 @@ msgstr "Soubory se prohledávají, prosím čekejte." msgid "Current scanning" msgstr "Aktuální prohledávání" -#: templates/part.list.php:74 -msgid "directory" -msgstr "adresář" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "adresáře" - -#: templates/part.list.php:85 -msgid "file" -msgstr "soubor" - -#: templates/part.list.php:87 -msgid "files" -msgstr "soubory" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Aktualizuji mezipaměť souborového systému..." diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index d64ce09fe35..71b739cfa3b 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-30 07:31+0000\n" +"Last-Translator: pstast \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" @@ -25,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Nebyl zadan název aplikace" #: app.php:361 msgid "Help" @@ -89,59 +89,59 @@ msgstr "Stáhněte soubory po menších částech, samostatně, nebo se obraťte #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nebyl zadán zdroj při instalaci aplikace" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nebyl zadán odkaz pro instalaci aplikace z HTTP" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nebyla zadána cesta pro instalaci aplikace z místního souboru" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Archivy typu %s nejsou podporovány" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Chyba při otevírání archivu během instalace aplikace" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Aplikace neposkytuje soubor info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Aplikace nemůže být nainstalována, protože obsahuje značku\n\n\ntrue\n\n\ncož není povoleno pro nedodávané aplikace" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací." #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Adresář aplikace již existuje" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 9cb3b6446f8..d3f48fd240d 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-28 16:41+0000\n" +"Last-Translator: pstast \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" @@ -88,53 +88,53 @@ msgstr "Nelze odebrat uživatele ze skupiny %s" msgid "Couldn't update app." msgstr "Nelze aktualizovat aplikaci." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizovat na {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Zakázat" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Povolit" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Čekejte prosím..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Chyba při zakazování aplikace" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Chyba při povolování aplikace" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aktualizuji..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Chyba při aktualizaci aplikace" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Chyba" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aktualizovat" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aktualizováno" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut." +msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu." #: js/personal.js:172 msgid "Saving..." @@ -483,11 +483,11 @@ msgstr "Šifrování" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory" +msgstr "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory" #: templates/personal.php:125 msgid "Log-in password" -msgstr "Heslo" +msgstr "Přihlašovací heslo" #: templates/personal.php:130 msgid "Decrypt all Files" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 6245bd4e833..6617ad24829 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:11-0400\n" -"PO-Revision-Date: 2013-08-20 17:00+0000\n" -"Last-Translator: cvanca \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-28 16:52+0000\n" +"Last-Translator: pstast \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" @@ -159,7 +159,7 @@ msgstr "Filtr přihlášení uživatelů" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"" +msgstr "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -169,7 +169,7 @@ msgstr "Filtr seznamu uživatelů" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"" +msgstr "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -179,7 +179,7 @@ msgstr "Filtr skupin" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"" +msgstr "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index 26b314362f3..638507e646f 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -476,7 +480,7 @@ msgstr "Personol" msgid "Users" msgstr "Defnyddwyr" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Pecynnau" @@ -609,10 +613,6 @@ msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru." msgid "Log out" msgstr "Allgofnodi" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Gwrthodwyd mewngofnodi awtomatig!" @@ -627,19 +627,19 @@ msgstr "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif msgid "Please change your password to secure your account again." msgstr "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Wedi colli'ch cyfrinair?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "cofio" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Mewngofnodi" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Mewngofnodiadau Amgen" diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index 3d8d0f81fb7..c1e83e56cc9 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "Methwyd ysgrifennu i'r ddisg" msgid "Not enough storage available" msgstr "Dim digon o le storio ar gael" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Cyfeiriadur annilys." @@ -94,20 +98,20 @@ msgstr "Dim digon o le ar gael" msgid "Upload cancelled." msgstr "Diddymwyd llwytho i fyny." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Does dim hawl cael URL gwag." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Gwall" @@ -123,35 +127,55 @@ msgstr "Dileu'n barhaol" msgid "Rename" msgstr "Ailenwi" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "I ddod" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} yn bodoli'n barod" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "amnewid" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "awgrymu enw" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "diddymu" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "newidiwyd {new_name} yn lle {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "dadwneud" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -159,7 +183,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "ffeiliau'n llwytho i fyny" @@ -209,22 +233,6 @@ msgstr "Maint" msgid "Modified" msgstr "Addaswyd" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -328,22 +336,6 @@ msgstr "Arhoswch, mae ffeiliau'n cael eu sganio." msgid "Current scanning" msgstr "Sganio cyfredol" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Uwchraddio storfa system ffeiliau..." diff --git a/l10n/da/core.po b/l10n/da/core.po index 68c71a9ef2d..5c71f405c59 100644 --- a/l10n/da/core.po +++ b/l10n/da/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" -"Last-Translator: Sappe\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -26,6 +26,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s delte »%s« med sig" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "Startede vedligeholdelsestilstand" @@ -471,7 +475,7 @@ msgstr "Personligt" msgid "Users" msgstr "Brugere" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -604,10 +608,6 @@ msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer." msgid "Log out" msgstr "Log ud" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Flere programmer" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatisk login afvist!" @@ -622,19 +622,19 @@ msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis t msgid "Please change your password to secure your account again." msgstr "Skift adgangskode for at sikre din konto igen." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Mistet dit kodeord?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "husk" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Log ind" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternative logins" diff --git a/l10n/da/files.po b/l10n/da/files.po index 218518cb6ed..3f9da02827c 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Fejl ved skrivning til disk." msgid "Not enough storage available" msgstr "Der er ikke nok plads til rådlighed" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -97,20 +101,20 @@ msgstr "ikke nok tilgængelig ledig plads " msgid "Upload cancelled." msgstr "Upload afbrudt." -#: js/file-upload.js:167 +#: js/file-upload.js:165 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/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URLen kan ikke være tom." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fejl" @@ -126,41 +130,57 @@ msgstr "Slet permanent" msgid "Rename" msgstr "Omdøb" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Afventer" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} eksisterer allerede" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "erstat" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "fortryd" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "erstattede {new_name} med {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "fortryd" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n mappe" +msgstr[1] "%n mapper" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n fil" +msgstr[1] "%n filer" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploader %n fil" msgstr[1] "Uploader %n filer" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "uploader filer" @@ -210,18 +230,6 @@ msgstr "Størrelse" msgid "Modified" msgstr "Ændret" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n mappe" -msgstr[1] "%n mapper" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n fil" -msgstr[1] "%n filer" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Filerne bliver indlæst, vent venligst." msgid "Current scanning" msgstr "Indlæser" -#: templates/part.list.php:74 -msgid "directory" -msgstr "mappe" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "Mapper" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fil" - -#: templates/part.list.php:87 -msgid "files" -msgstr "filer" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Opgraderer filsystems cachen..." diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 7873b58ef50..d6c79b185e9 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 05:10+0000\n" +"Last-Translator: claus_chr \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" @@ -25,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Intet app-navn angivet" #: app.php:361 msgid "Help" @@ -89,59 +89,59 @@ msgstr "Download filerne i små bider, seperat, eller kontakt venligst din admin #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Ingen kilde angivet under installation af app" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Ingen href angivet under installation af app via http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Ingen sti angivet under installation af app fra lokal fil" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Arkiver af type %s understøttes ikke" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Kunne ikke åbne arkiv under installation af appen" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Der følger ingen info.xml-fil med appen" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Appen kan ikke installeres, da den indeholder ikke-tilladt kode" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud." #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Appen kan ikke installeres, da den indeholder taget\n\n\ntrue\n\n\nhvilket ikke er tilladt for ikke-medfølgende apps" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "App-mappe findes allerede" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Kan ikke oprette app-mappe. Ret tilladelser. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/de/core.po b/l10n/de/core.po index 9a2039502c1..23574ea9813 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-28 08:30+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,6 +30,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s teilte »%s« mit Ihnen" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "Wartungsmodus eingeschaltet" @@ -475,7 +479,7 @@ msgstr "Persönlich" msgid "Users" msgstr "Benutzer" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -608,10 +612,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e msgid "Log out" msgstr "Abmelden" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Mehr Apps" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatischer Login zurückgewiesen!" @@ -626,19 +626,19 @@ msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAcc msgid "Please change your password to secure your account again." msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Passwort vergessen?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "merken" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Einloggen" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternative Logins" diff --git a/l10n/de/files.po b/l10n/de/files.po index a18eb37b0da..eb931d39214 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -80,7 +80,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -100,20 +104,20 @@ msgstr "Nicht genug Speicherplatz verfügbar" msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fehler" @@ -129,41 +133,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} ersetzt durch {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n Ordner" +msgstr[1] "%n Ordner" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n Datei" +msgstr[1] "%n Dateien" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -213,18 +233,6 @@ msgstr "Größe" msgid "Modified" msgstr "Geändert" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n Ordner" -msgstr[1] "%n Ordner" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n Datei" -msgstr[1] "%n Dateien" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -328,22 +336,6 @@ msgstr "Dateien werden gescannt, bitte warten." msgid "Current scanning" msgstr "Scanne" -#: templates/part.list.php:74 -msgid "directory" -msgstr "Verzeichnis" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "Verzeichnisse" - -#: templates/part.list.php:85 -msgid "file" -msgstr "Datei" - -#: templates/part.list.php:87 -msgid "files" -msgstr "Dateien" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Dateisystem-Cache wird aktualisiert ..." diff --git a/l10n/de/lib.po b/l10n/de/lib.po index fff88cd0e31..4b00901bf50 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 10:05+0000\n" -"Last-Translator: noxin \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 11:20+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +30,7 @@ msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownC #: app.php:250 msgid "No app name specified" -msgstr "Es wurde kein App-Name angegeben" +msgstr "Es wurde kein Applikation-Name angegeben" #: app.php:361 msgid "Help" @@ -94,7 +94,7 @@ msgstr "Für die Installation der Applikation wurde keine Quelle angegeben" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "href wurde nicht angegeben um die Applikation per http zu installieren" +msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren" #: installer.php:75 msgid "No path specified when installing app from local file" @@ -107,7 +107,7 @@ msgstr "Archive vom Typ %s werden nicht unterstützt" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "Das Archive konnte bei der Installation der Applikation nicht geöffnet werden" +msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden" #: installer.php:123 msgid "App does not provide an info.xml file" @@ -121,19 +121,19 @@ msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert we msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist." #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Die Applikation konnte nicht installiert werden, da diese das true Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist" #: installer.php:160 msgid "App directory already exists" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index dbf98f0bf85..30ff6133c05 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 11:10+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,47 +89,47 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualisiere zu {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktivieren" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktivieren" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Bitte warten..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aktualisierung..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Fehler beim Aktualisieren der App" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fehler" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aktualisierung durchführen" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aktualisiert" diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po index b9ceaaa95d0..cc36dab1bef 100644 --- a/l10n/de/user_webdavauth.po +++ b/l10n/de/user_webdavauth.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-29 01:56-0400\n" -"PO-Revision-Date: 2013-07-28 16:10+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 20:16+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po index d6a26eb7c40..7f813bb30cf 100644 --- a/l10n/de_AT/core.po +++ b/l10n/de_AT/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -601,10 +605,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Mehr Apps" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -619,19 +619,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po index 4476d1f102f..d3f9d2d4218 100644 --- a/l10n/de_AT/files.po +++ b/l10n/de_AT/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index 95a01f1ff19..47c4fa12e7f 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -31,6 +31,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s teilt »%s« mit Ihnen" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -476,7 +480,7 @@ msgstr "Persönlich" msgid "Users" msgstr "Benutzer" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -609,10 +613,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e msgid "Log out" msgstr "Abmelden" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Mehr Apps" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatische Anmeldung verweigert!" @@ -627,19 +627,19 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc msgid "Please change your password to secure your account again." msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Passwort vergessen?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "merken" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Einloggen" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternative Logins" diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po index fae903c9a3a..a1c58799f33 100644 --- a/l10n/de_CH/files.po +++ b/l10n/de_CH/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -83,7 +83,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -103,20 +107,20 @@ msgstr "Nicht genügend Speicherplatz verfügbar" msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fehler" @@ -132,41 +136,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "%n Ordner" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "%n Dateien" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -216,18 +236,6 @@ msgstr "Grösse" msgid "Modified" msgstr "Geändert" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "%n Ordner" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "%n Dateien" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -331,22 +339,6 @@ msgstr "Dateien werden gescannt, bitte warten." msgid "Current scanning" msgstr "Scanne" -#: templates/part.list.php:74 -msgid "directory" -msgstr "Verzeichnis" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "Verzeichnisse" - -#: templates/part.list.php:85 -msgid "file" -msgstr "Datei" - -#: templates/part.list.php:87 -msgid "files" -msgstr "Dateien" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Dateisystem-Cache wird aktualisiert ..." diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index 9ef89b0fc89..1a3f292dc07 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-28 08:30+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,6 +30,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s geteilt »%s« mit Ihnen" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "Wartungsmodus eingeschaltet " @@ -475,7 +479,7 @@ msgstr "Persönlich" msgid "Users" msgstr "Benutzer" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -608,10 +612,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e msgid "Log out" msgstr "Abmelden" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Mehr Apps" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatische Anmeldung verweigert!" @@ -626,19 +626,19 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc msgid "Please change your password to secure your account again." msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Passwort vergessen?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "merken" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Einloggen" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternative Logins" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 03c2d0b576c..1282d6306c9 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -82,7 +82,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -102,20 +106,20 @@ msgstr "Nicht genügend Speicherplatz verfügbar" msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fehler" @@ -131,41 +135,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n Ordner" +msgstr[1] "%n Ordner" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n Datei" +msgstr[1] "%n Dateien" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hoch geladen" msgstr[1] "%n Dateien werden hoch geladen" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -215,18 +235,6 @@ msgstr "Größe" msgid "Modified" msgstr "Geändert" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n Ordner" -msgstr[1] "%n Ordner" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n Datei" -msgstr[1] "%n Dateien" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -330,22 +338,6 @@ msgstr "Dateien werden gescannt, bitte warten." msgid "Current scanning" msgstr "Scanne" -#: templates/part.list.php:74 -msgid "directory" -msgstr "Verzeichnis" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "Verzeichnisse" - -#: templates/part.list.php:85 -msgid "file" -msgstr "Datei" - -#: templates/part.list.php:87 -msgid "files" -msgstr "Dateien" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Dateisystem-Cache wird aktualisiert ..." diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 567fcc9a526..2abd875bdd9 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 12:00+0000\n" -"Last-Translator: traductor \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 11:30+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Es wurde kein Applikation-Name angegeben" #: app.php:361 msgid "Help" @@ -89,15 +89,15 @@ msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bi #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Für die Installation der Applikation wurde keine Quelle angegeben" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben" #: installer.php:89 #, php-format @@ -106,15 +106,15 @@ msgstr "Archive des Typs %s werden nicht unterstützt." #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Die Applikation enthält keine info,xml Datei" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden" #: installer.php:138 msgid "" @@ -126,13 +126,13 @@ msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Die Applikation konnte nicht installiert werden, da diese das true Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist" #: installer.php:160 msgid "App directory already exists" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 0eb0623b9f7..a2f41d584fa 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 12:00+0000\n" -"Last-Translator: traductor \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 11:10+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,47 +91,47 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Update zu {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktivieren" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktivieren" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Bitte warten...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "Beim deaktivieren der Applikation ist ein Fehler aufgetreten." +msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "Beim aktivieren der Applikation ist ein Fehler aufgetreten." +msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Update..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Es ist ein Fehler während des Updates aufgetreten" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fehler" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Update durchführen" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aktualisiert" diff --git a/l10n/el/core.po b/l10n/el/core.po index a91b290a560..31ff37b3eeb 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -29,6 +29,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -474,7 +478,7 @@ msgstr "Προσωπικά" msgid "Users" msgstr "Χρήστες" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Εφαρμογές" @@ -607,10 +611,6 @@ msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες π msgid "Log out" msgstr "Αποσύνδεση" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Απορρίφθηκε η αυτόματη σύνδεση!" @@ -625,19 +625,19 @@ msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προ msgid "Please change your password to secure your account again." msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ξεχάσατε το συνθηματικό σας;" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "απομνημόνευση" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Είσοδος" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Εναλλακτικές Συνδέσεις" diff --git a/l10n/el/files.po b/l10n/el/files.po index 2ae026cfed0..50dcd3f9477 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -5,12 +5,13 @@ # Translators: # Efstathios Iosifidis , 2013 # Efstathios Iosifidis , 2013 +# frerisp , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +77,11 @@ msgstr "Αποτυχία εγγραφής στο δίσκο" msgid "Not enough storage available" msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Μη έγκυρος φάκελος." @@ -96,20 +101,20 @@ msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος" msgid "Upload cancelled." msgstr "Η αποστολή ακυρώθηκε." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Η URL δεν μπορεί να είναι κενή." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Σφάλμα" @@ -125,41 +130,57 @@ msgstr "Μόνιμη διαγραφή" msgid "Rename" msgstr "Μετονομασία" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Εκκρεμεί" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} υπάρχει ήδη" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "αντικαταστάθηκε το {new_name} με {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n φάκελος" +msgstr[1] "%n φάκελοι" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n αρχείο" +msgstr[1] "%n αρχεία" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ανέβασμα %n αρχείου" +msgstr[1] "Ανέβασμα %n αρχείων" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "αρχεία ανεβαίνουν" @@ -189,7 +210,7 @@ msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμ msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις" #: js/files.js:245 msgid "" @@ -209,18 +230,6 @@ msgstr "Μέγεθος" msgid "Modified" msgstr "Τροποποιήθηκε" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +333,6 @@ msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμέν msgid "Current scanning" msgstr "Τρέχουσα ανίχνευση" -#: templates/part.list.php:74 -msgid "directory" -msgstr "κατάλογος" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "κατάλογοι" - -#: templates/part.list.php:85 -msgid "file" -msgstr "αρχείο" - -#: templates/part.list.php:87 -msgid "files" -msgstr "αρχεία" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Ενημέρωση της μνήμης cache του συστήματος αρχείων..." diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po index 9419e249a1f..d1043567c1b 100644 --- a/l10n/el/files_trashbin.po +++ b/l10n/el/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 09:00+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" @@ -28,43 +28,43 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s" msgid "Couldn't restore %s" msgstr "Αδυναμία επαναφοράς %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "εκτέλεση λειτουργία επαναφοράς" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Σφάλμα" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "μόνιμη διαγραφή αρχείου" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Μόνιμη διαγραφή" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Όνομα" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Διαγράφηκε" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n φάκελοι" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n αρχεία" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "έγινε επαναφορά" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index f2ee458fc91..8bc849cef43 100644 --- a/l10n/en@pirate/core.po +++ b/l10n/en@pirate/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -601,10 +605,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -619,19 +619,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po index c5bb03e57e3..5874adaf38d 100644 --- a/l10n/en@pirate/files.po +++ b/l10n/en@pirate/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po new file mode 100644 index 00000000000..26e1f3c14a9 --- /dev/null +++ b/l10n/en_GB/core.po @@ -0,0 +1,648 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "%s shared \"%s\" with you" + +#: ajax/share.php:227 +msgid "group" +msgstr "group" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "Turned on maintenance mode" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "Turned off maintenance mode" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "Updated database" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "Updating filecache, this may take a really long time..." + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "Updated filecache" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "... %d%% done ..." + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "Category type not provided." + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "No category to add?" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "This category already exists: %s" + +#: 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 "Object type not provided." + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "%s ID not provided." + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "Error adding %s to favourites." + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "No categories selected for deletion." + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "Error removing %s from favourites." + +#: js/config.php:32 +msgid "Sunday" +msgstr "Sunday" + +#: js/config.php:33 +msgid "Monday" +msgstr "Monday" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "Tuesday" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "Wednesday" + +#: js/config.php:36 +msgid "Thursday" +msgstr "Thursday" + +#: js/config.php:37 +msgid "Friday" +msgstr "Friday" + +#: js/config.php:38 +msgid "Saturday" +msgstr "Saturday" + +#: js/config.php:43 +msgid "January" +msgstr "January" + +#: js/config.php:44 +msgid "February" +msgstr "February" + +#: js/config.php:45 +msgid "March" +msgstr "March" + +#: js/config.php:46 +msgid "April" +msgstr "April" + +#: js/config.php:47 +msgid "May" +msgstr "May" + +#: js/config.php:48 +msgid "June" +msgstr "June" + +#: js/config.php:49 +msgid "July" +msgstr "July" + +#: js/config.php:50 +msgid "August" +msgstr "August" + +#: js/config.php:51 +msgid "September" +msgstr "September" + +#: js/config.php:52 +msgid "October" +msgstr "October" + +#: js/config.php:53 +msgid "November" +msgstr "November" + +#: js/config.php:54 +msgid "December" +msgstr "December" + +#: js/js.js:355 +msgid "Settings" +msgstr "Settings" + +#: js/js.js:812 +msgid "seconds ago" +msgstr "seconds ago" + +#: js/js.js:813 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "%n minute ago" +msgstr[1] "%n minutes ago" + +#: js/js.js:814 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "%n hour ago" +msgstr[1] "%n hours ago" + +#: js/js.js:815 +msgid "today" +msgstr "today" + +#: js/js.js:816 +msgid "yesterday" +msgstr "yesterday" + +#: js/js.js:817 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "%n day ago" +msgstr[1] "%n days ago" + +#: js/js.js:818 +msgid "last month" +msgstr "last month" + +#: js/js.js:819 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "%n month ago" +msgstr[1] "%n months ago" + +#: js/js.js:820 +msgid "months ago" +msgstr "months ago" + +#: js/js.js:821 +msgid "last year" +msgstr "last year" + +#: js/js.js:822 +msgid "years ago" +msgstr "years ago" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "Choose" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:210 +msgid "Error loading file picker template" +msgstr "Error loading file picker template" + +#: js/oc-dialogs.js:168 +msgid "Yes" +msgstr "Yes" + +#: js/oc-dialogs.js:178 +msgid "No" +msgstr "No" + +#: js/oc-dialogs.js:195 +msgid "Ok" +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 "The object type is not specified." + +#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:643 js/share.js:655 +msgid "Error" +msgstr "Error" + +#: js/oc-vcategories.js:179 +msgid "The app name is not specified." +msgstr "The app name is not specified." + +#: js/oc-vcategories.js:194 +msgid "The required file {file} is not installed!" +msgstr "The required file {file} is not installed!" + +#: js/share.js:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "Shared" + +#: js/share.js:90 +msgid "Share" +msgstr "Share" + +#: js/share.js:131 js/share.js:683 +msgid "Error while sharing" +msgstr "Error whilst sharing" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "Error whilst unsharing" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "Error whilst changing permissions" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "Shared with you and the group {group} by {owner}" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "Shared with you by {owner}" + +#: js/share.js:183 +msgid "Share with" +msgstr "Share with" + +#: js/share.js:188 +msgid "Share with link" +msgstr "Share with link" + +#: js/share.js:191 +msgid "Password protect" +msgstr "Password protect" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "Password" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "Allow Public Upload" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "Email link to person" + +#: js/share.js:203 +msgid "Send" +msgstr "Send" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "Set expiration date" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "Expiration date" + +#: js/share.js:241 +msgid "Share via email:" +msgstr "Share via email:" + +#: js/share.js:243 +msgid "No people found" +msgstr "No people found" + +#: js/share.js:281 +msgid "Resharing is not allowed" +msgstr "Resharing is not allowed" + +#: js/share.js:317 +msgid "Shared in {item} with {user}" +msgstr "Shared in {item} with {user}" + +#: js/share.js:338 +msgid "Unshare" +msgstr "Unshare" + +#: js/share.js:350 +msgid "can edit" +msgstr "can edit" + +#: js/share.js:352 +msgid "access control" +msgstr "access control" + +#: js/share.js:355 +msgid "create" +msgstr "create" + +#: js/share.js:358 +msgid "update" +msgstr "update" + +#: js/share.js:361 +msgid "delete" +msgstr "delete" + +#: js/share.js:364 +msgid "share" +msgstr "share" + +#: js/share.js:398 js/share.js:630 +msgid "Password protected" +msgstr "Password protected" + +#: js/share.js:643 +msgid "Error unsetting expiration date" +msgstr "Error unsetting expiration date" + +#: js/share.js:655 +msgid "Error setting expiration date" +msgstr "Error setting expiration date" + +#: js/share.js:670 +msgid "Sending ..." +msgstr "Sending ..." + +#: js/share.js:681 +msgid "Email sent" +msgstr "Email sent" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "The update was unsuccessful. Please report this issue to the ownCloud community." + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "The update was successful. Redirecting you to ownCloud now." + +#: lostpassword/controller.php:61 +#, php-format +msgid "%s password reset" +msgstr "%s password reset" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Use the following link to reset your password: {link}" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
    If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
    If it is not there ask your local administrator ." +msgstr "The link to reset your password has been sent to your email.
    If you do not receive it within a reasonable amount of time, check your spam/junk folders.
    If it is not there ask your local administrator ." + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
    Did you make sure your email/username was right?" +msgstr "Request failed!
    Did you make sure your email/username was correct?" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "You will receive a link to reset your password via Email." + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "Username" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "Yes, I really want to reset my password now" + +#: lostpassword/templates/lostpassword.php:27 +msgid "Request reset" +msgstr "Request reset" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "Your password was reset" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "To login page" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "New password" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "Reset password" + +#: strings.php:5 +msgid "Personal" +msgstr "Personal" + +#: strings.php:6 +msgid "Users" +msgstr "Users" + +#: strings.php:7 templates/layout.user.php:105 +msgid "Apps" +msgstr "Apps" + +#: strings.php:8 +msgid "Admin" +msgstr "Admin" + +#: strings.php:9 +msgid "Help" +msgstr "Help" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "Access denied" + +#: templates/404.php:15 +msgid "Cloud not found" +msgstr "Cloud not found" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "Edit categories" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "Add" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "Security Warning" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "Please update your PHP installation to use %s securely." + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "No secure random number generator is available, please enable the PHP OpenSSL extension." + +#: templates/installation.php:33 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." + +#: templates/installation.php:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "For information how to properly configure your server, please see the documentation." + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "Create an admin account" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "Advanced" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "Data folder" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "Configure the database" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "will be used" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "Database user" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "Database password" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "Database name" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "Database tablespace" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "Database host" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "Finish setup" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "%s is available. Get more information on how to update." + +#: templates/layout.user.php:66 +msgid "Log out" +msgstr "Log out" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "Automatic logon rejected!" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "If you did not change your password recently, your account may be compromised!" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "Please change your password to secure your account again." + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "Lost your password?" + +#: templates/login.php:37 +msgid "remember" +msgstr "remember" + +#: templates/login.php:39 +msgid "Log in" +msgstr "Log in" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "Alternative Logins" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

    just letting you know that %s shared »%s« with you.
    View it!

    Cheers!" +msgstr "Hey there,

    just letting you know that %s shared \"%s\" with you.
    View it!

    Cheers!" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "Updating ownCloud to version %s, this may take a while." diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po new file mode 100644 index 00000000000..04300969e06 --- /dev/null +++ b/l10n/en_GB/files.po @@ -0,0 +1,336 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "Could not move %s - File with this name already exists" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "Could not move %s" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "Unable to set upload directory." + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "Invalid Token" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "No file was uploaded. Unknown error" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "There is no error, the file uploaded successfully" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: " + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "The uploaded file was only partially uploaded" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "No file was uploaded" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "Missing a temporary folder" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "Failed to write to disk" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "Not enough storage available" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "Upload failed" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "Invalid directory." + +#: appinfo/app.php:12 +msgid "Files" +msgstr "Files" + +#: js/file-upload.js:11 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "Unable to upload your file as it is a directory or has 0 bytes" + +#: js/file-upload.js:24 +msgid "Not enough space available" +msgstr "Not enough space available" + +#: js/file-upload.js:64 +msgid "Upload cancelled." +msgstr "Upload cancelled." + +#: js/file-upload.js:165 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "File upload is in progress. Leaving the page now will cancel the upload." + +#: js/file-upload.js:239 +msgid "URL cannot be empty." +msgstr "URL cannot be empty." + +#: js/file-upload.js:244 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" + +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +msgid "Error" +msgstr "Error" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "Share" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "Delete permanently" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "Rename" + +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +msgid "Pending" +msgstr "Pending" + +#: js/filelist.js:305 js/filelist.js:307 +msgid "{new_name} already exists" +msgstr "{new_name} already exists" + +#: js/filelist.js:305 js/filelist.js:307 +msgid "replace" +msgstr "replace" + +#: js/filelist.js:305 +msgid "suggest name" +msgstr "suggest name" + +#: js/filelist.js:305 js/filelist.js:307 +msgid "cancel" +msgstr "cancel" + +#: js/filelist.js:352 +msgid "replaced {new_name} with {old_name}" +msgstr "replaced {new_name} with {old_name}" + +#: js/filelist.js:352 +msgid "undo" +msgstr "undo" + +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n folder" +msgstr[1] "%n folders" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n file" +msgstr[1] "%n files" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "{dirs} and {files}" + +#: js/filelist.js:561 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "Uploading %n file" +msgstr[1] "Uploading %n files" + +#: js/filelist.js:626 +msgid "files uploading" +msgstr "files uploading" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "'.' is an invalid file name." + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "File name cannot be empty." + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "Your storage is full, files can not be updated or synced anymore!" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "Your storage is almost full ({usedSpacePercent}%)" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." + +#: js/files.js:245 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "Your download is being prepared. This might take some time if the files are big." + +#: js/files.js:562 templates/index.php:67 +msgid "Name" +msgstr "Name" + +#: js/files.js:563 templates/index.php:78 +msgid "Size" +msgstr "Size" + +#: js/files.js:564 templates/index.php:80 +msgid "Modified" +msgstr "Modified" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "%s could not be renamed" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "Upload" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "File handling" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "Maximum upload size" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "max. possible: " + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "Needed for multi-file and folder downloads." + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "Enable ZIP-download" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "0 is unlimited" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "Maximum input size for ZIP files" + +#: templates/admin.php:26 +msgid "Save" +msgstr "Save" + +#: templates/index.php:7 +msgid "New" +msgstr "New" + +#: templates/index.php:10 +msgid "Text file" +msgstr "Text file" + +#: templates/index.php:12 +msgid "Folder" +msgstr "Folder" + +#: templates/index.php:14 +msgid "From link" +msgstr "From link" + +#: templates/index.php:41 +msgid "Deleted files" +msgstr "Deleted files" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "Cancel upload" + +#: templates/index.php:52 +msgid "You don’t have write permissions here." +msgstr "You don’t have write permission here." + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "Nothing in here. Upload something!" + +#: templates/index.php:73 +msgid "Download" +msgstr "Download" + +#: templates/index.php:85 templates/index.php:86 +msgid "Unshare" +msgstr "Unshare" + +#: templates/index.php:91 templates/index.php:92 +msgid "Delete" +msgstr "Delete" + +#: templates/index.php:105 +msgid "Upload too large" +msgstr "Upload too large" + +#: templates/index.php:107 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server." + +#: templates/index.php:112 +msgid "Files are being scanned, please wait." +msgstr "Files are being scanned, please wait." + +#: templates/index.php:115 +msgid "Current scanning" +msgstr "Current scanning" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "Upgrading filesystem cache..." diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po new file mode 100644 index 00000000000..b81a0ff62ab --- /dev/null +++ b/l10n/en_GB/files_encryption.po @@ -0,0 +1,177 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-29 16:50+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "Recovery key enabled successfully" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "Could not enable recovery key. Please check your recovery key password!" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "Recovery key disabled successfully" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "Could not disable recovery key. Please check your recovery key password!" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "Password changed successfully." + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "Could not change the password. Maybe the old password was incorrect." + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "Private key password updated successfully." + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "Could not update the private key password. Maybe the old password was not correct." + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." + +#: hooks/hooks.php:41 +msgid "Missing requirements." +msgstr "Missing requirements." + +#: hooks/hooks.php:42 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." + +#: hooks/hooks.php:249 +msgid "Following users are not set up for encryption:" +msgstr "Following users are not set up for encryption:" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "Saving..." + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "Your private key is not valid! Maybe the your password was changed externally." + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "You can unlock your private key in your " + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "personal settings" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "Encryption" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "Enable recovery key (allow to recover users files in case of password loss):" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "Recovery key password" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "Enabled" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "Disabled" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "Change recovery key password:" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "Old Recovery key password" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "New Recovery key password" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "Change Password" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "Your private key password no longer match your login password:" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "Set your old private key password to your current login password." + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr " If you don't remember your old password you can ask your administrator to recover your files." + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "Old login password" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "Current login password" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "Update Private Key Password" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "Enable password recovery:" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "File recovery settings updated" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "Could not update file recovery" diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po new file mode 100644 index 00000000000..fc51da0a011 --- /dev/null +++ b/l10n/en_GB/files_external.po @@ -0,0 +1,124 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 17:00+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "Access granted" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "Error configuring Dropbox storage" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "Grant access" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "Please provide a valid Dropbox app key and secret." + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "Error configuring Google Drive storage" + +#: lib/config.php:453 +msgid "" +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " +"is not possible. Please ask your system administrator to install it." +msgstr "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." + +#: lib/config.php:457 +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 "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." + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "External Storage" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "Folder name" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "External storage" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "Configuration" + +#: templates/settings.php:12 +msgid "Options" +msgstr "Options" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "Applicable" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "Add storage" + +#: templates/settings.php:90 +msgid "None set" +msgstr "None set" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "All Users" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "Groups" + +#: templates/settings.php:100 +msgid "Users" +msgstr "Users" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "Delete" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "Enable User External Storage" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "Allow users to mount their own external storage" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "SSL root certificates" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "Import Root Certificate" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po new file mode 100644 index 00000000000..93495b536e6 --- /dev/null +++ b/l10n/en_GB/files_sharing.po @@ -0,0 +1,81 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 17:00+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "The password is wrong. Try again." + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "Password" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "Submit" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "Sorry, this link doesn’t seem to work anymore." + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "Reasons might be:" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "the item was removed" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "the link expired" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "sharing is disabled" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "For more info, please ask the person who sent this link." + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "%s shared the folder %s with you" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "%s shared the file %s with you" + +#: templates/public.php:26 templates/public.php:88 +msgid "Download" +msgstr "Download" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "Upload" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "Cancel upload" + +#: templates/public.php:85 +msgid "No preview available for" +msgstr "No preview available for" diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po new file mode 100644 index 00000000000..ae821adafa1 --- /dev/null +++ b/l10n/en_GB/files_trashbin.po @@ -0,0 +1,85 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "Couldn't delete %s permanently" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "Couldn't restore %s" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "perform restore operation" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "Error" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "delete file permanently" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "Delete permanently" + +#: js/trash.js:184 templates/index.php:17 +msgid "Name" +msgstr "Name" + +#: js/trash.js:185 templates/index.php:27 +msgid "Deleted" +msgstr "Deleted" + +#: js/trash.js:193 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "%n folders" + +#: js/trash.js:199 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "%n files" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "restored" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "Nothing in here. Your recycle bin is empty!" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "Restore" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "Delete" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "Deleted Files" diff --git a/l10n/en_GB/files_versions.po b/l10n/en_GB/files_versions.po new file mode 100644 index 00000000000..e727185fa79 --- /dev/null +++ b/l10n/en_GB/files_versions.po @@ -0,0 +1,44 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "Could not revert: %s" + +#: js/versions.js:7 +msgid "Versions" +msgstr "Versions" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "Failed to revert {file} to revision {timestamp}." + +#: js/versions.js:79 +msgid "More versions..." +msgstr "More versions..." + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "No other versions available" + +#: js/versions.js:145 +msgid "Restore" +msgstr "Restore" diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po new file mode 100644 index 00000000000..413e7ae427d --- /dev/null +++ b/l10n/en_GB/lib.po @@ -0,0 +1,323 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 16:50+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." + +#: app.php:250 +msgid "No app name specified" +msgstr "No app name specified" + +#: app.php:361 +msgid "Help" +msgstr "Help" + +#: app.php:374 +msgid "Personal" +msgstr "Personal" + +#: app.php:385 +msgid "Settings" +msgstr "Settings" + +#: app.php:397 +msgid "Users" +msgstr "Users" + +#: app.php:410 +msgid "Admin" +msgstr "Admin" + +#: app.php:837 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "Failed to upgrade \"%s\"." + +#: defaults.php:35 +msgid "web services under your control" +msgstr "web services under your control" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "cannot open \"%s\"" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "ZIP download is turned off." + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "Files need to be downloaded one by one." + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "Back to Files" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "Selected files too large to generate zip file." + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "Download the files in smaller chunks, seperately or kindly ask your administrator." + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "No source specified when installing app" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "No href specified when installing app from http" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "No path specified when installing app from local file" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "Archives of type %s are not supported" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "Failed to open archive when installing app" + +#: installer.php:123 +msgid "App does not provide an info.xml file" +msgstr "App does not provide an info.xml file" + +#: installer.php:129 +msgid "App can't be installed because of not allowed code in the App" +msgstr "App can't be installed because of unallowed code in the App" + +#: installer.php:138 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "App can't be installed because it is not compatible with this version of ownCloud" + +#: installer.php:144 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "App can't be installed because it contains the true tag which is not allowed for non shipped apps" + +#: installer.php:150 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" + +#: installer.php:160 +msgid "App directory already exists" +msgstr "App directory already exists" + +#: installer.php:173 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "Can't create app folder. Please fix permissions. %s" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "Application is not enabled" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "Authentication error" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "Token expired. Please reload page." + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "Files" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "Text" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "Images" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "%s enter the database username." + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "%s enter the database name." + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "%s you may not use dots in the database name" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "MS SQL username and/or password not valid: %s" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "You need to enter either an existing account or the administrator." + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "MySQL username and/or password not valid" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "DB Error: \"%s\"" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "Offending command was: \"%s\"" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "MySQL user '%s'@'localhost' exists already." + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "Drop this user from MySQL" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "MySQL user '%s'@'%%' already exists" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "Drop this user from MySQL." + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "Oracle connection could not be established" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "Oracle username and/or password not valid" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "Offending command was: \"%s\", name: %s, password: %s" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "PostgreSQL username and/or password not valid" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "Set an admin username." + +#: setup.php:31 +msgid "Set an admin password." +msgstr "Set an admin password." + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken." + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "Please double check the installation guides." + +#: template/functions.php:80 +msgid "seconds ago" +msgstr "seconds ago" + +#: template/functions.php:81 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "%n minutes ago" + +#: template/functions.php:82 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "%n hours ago" + +#: template/functions.php:83 +msgid "today" +msgstr "today" + +#: template/functions.php:84 +msgid "yesterday" +msgstr "yesterday" + +#: template/functions.php:85 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "%n days ago" + +#: template/functions.php:86 +msgid "last month" +msgstr "last month" + +#: template/functions.php:87 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "%n months ago" + +#: template/functions.php:88 +msgid "last year" +msgstr "last year" + +#: template/functions.php:89 +msgid "years ago" +msgstr "years ago" + +#: template.php:297 +msgid "Caused by:" +msgstr "Caused by:" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "Could not find category \"%s\"" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po new file mode 100644 index 00000000000..ece8bf22f34 --- /dev/null +++ b/l10n/en_GB/settings.po @@ -0,0 +1,541 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 16:50+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "Unable to load list from App Store" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 +msgid "Authentication error" +msgstr "Authentication error" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "Your display name has been changed." + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "Unable to change display name" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "Group already exists" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "Unable to add group" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "Email saved" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "Invalid email" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "Unable to delete group" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "Unable to delete user" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "Language changed" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "Invalid request" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "Admins can't remove themselves from the admin group" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "Unable to add user to group %s" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "Unable to remove user from group %s" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "Couldn't update app." + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "Update to {appversion}" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "Disable" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "Enable" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "Please wait...." + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "Error whilst disabling app" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "Error whilst enabling app" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "Updating...." + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "Error whilst updating app" + +#: js/apps.js:126 +msgid "Error" +msgstr "Error" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "Update" + +#: js/apps.js:130 +msgid "Updated" +msgstr "Updated" + +#: js/personal.js:150 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "Decrypting files... Please wait, this can take some time." + +#: js/personal.js:172 +msgid "Saving..." +msgstr "Saving..." + +#: js/users.js:47 +msgid "deleted" +msgstr "deleted" + +#: js/users.js:47 +msgid "undo" +msgstr "undo" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "Unable to remove user" + +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 +msgid "Groups" +msgstr "Groups" + +#: js/users.js:97 templates/users.php:89 templates/users.php:124 +msgid "Group Admin" +msgstr "Group Admin" + +#: js/users.js:120 templates/users.php:164 +msgid "Delete" +msgstr "Delete" + +#: js/users.js:277 +msgid "add group" +msgstr "add group" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "A valid username must be provided" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "Error creating user" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "A valid password must be provided" + +#: personal.php:40 personal.php:41 +msgid "__language_name__" +msgstr "__language_name__" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "Security Warning" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "Setup Warning" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken." + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "Please double check the installation guides." + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "Module 'fileinfo' missing" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "Locale not working" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "Internet connection not working" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." + +#: templates/admin.php:92 +msgid "Cron" +msgstr "Cron" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "Execute one task with each page loaded" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "cron.php is registered at a webcron service to call cron.php once a minute over http." + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "Use systems cron service to call the cron.php file once a minute." + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "Sharing" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "Enable Share API" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "Allow apps to use the Share API" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "Allow links" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "Allow users to share items to the public with links" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "Allow public uploads" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "Allow users to enable others to upload into their publicly shared folders" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "Allow resharing" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "Allow users to share items shared with them again" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "Allow users to share with anyone" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "Allow users to only share with users in their groups" + +#: templates/admin.php:170 +msgid "Security" +msgstr "Security" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "Enforce HTTPS" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "Forces the clients to connect to %s via an encrypted connection." + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." + +#: templates/admin.php:203 +msgid "Log" +msgstr "Log" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "Log level" + +#: templates/admin.php:235 +msgid "More" +msgstr "More" + +#: templates/admin.php:236 +msgid "Less" +msgstr "Less" + +#: templates/admin.php:242 templates/personal.php:140 +msgid "Version" +msgstr "Version" + +#: templates/admin.php:246 templates/personal.php:143 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "Add your App" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "More Apps" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "Select an App" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "See application page at apps.owncloud.com" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "-licensed by " + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "User Documentation" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "Administrator Documentation" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "Online Documentation" + +#: templates/help.php:11 +msgid "Forum" +msgstr "Forum" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "Bugtracker" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "Commercial Support" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "Get the apps to sync your files" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "Show First Run Wizard again" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "You have used %s of the available %s" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:86 +msgid "Password" +msgstr "Password" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "Your password was changed" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "Unable to change your password" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "Current password" + +#: templates/personal.php:44 +msgid "New password" +msgstr "New password" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "Change password" + +#: templates/personal.php:58 templates/users.php:85 +msgid "Display Name" +msgstr "Display Name" + +#: templates/personal.php:73 +msgid "Email" +msgstr "Email" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "Your email address" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "Fill in an email address to enable password recovery" + +#: templates/personal.php:85 templates/personal.php:86 +msgid "Language" +msgstr "Language" + +#: templates/personal.php:98 +msgid "Help translate" +msgstr "Help translate" + +#: templates/personal.php:104 +msgid "WebDAV" +msgstr "WebDAV" + +#: templates/personal.php:106 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "Use this address to access your Files via WebDAV" + +#: templates/personal.php:117 +msgid "Encryption" +msgstr "Encryption" + +#: templates/personal.php:119 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "The encryption app is no longer enabled, decrypt all your files" + +#: templates/personal.php:125 +msgid "Log-in password" +msgstr "Log-in password" + +#: templates/personal.php:130 +msgid "Decrypt all Files" +msgstr "Decrypt all Files" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "Login Name" + +#: templates/users.php:30 +msgid "Create" +msgstr "Create" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "Admin Recovery Password" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Enter the recovery password in order to recover the user's files during password change" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "Default Storage" + +#: templates/users.php:48 templates/users.php:142 +msgid "Unlimited" +msgstr "Unlimited" + +#: templates/users.php:66 templates/users.php:157 +msgid "Other" +msgstr "Other" + +#: templates/users.php:84 +msgid "Username" +msgstr "Username" + +#: templates/users.php:91 +msgid "Storage" +msgstr "Storage" + +#: templates/users.php:102 +msgid "change display name" +msgstr "change display name" + +#: templates/users.php:106 +msgid "set new password" +msgstr "set new password" + +#: templates/users.php:137 +msgid "Default" +msgstr "Default" diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po new file mode 100644 index 00000000000..8ea95e2d3bd --- /dev/null +++ b/l10n/en_GB/user_ldap.po @@ -0,0 +1,407 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 17:30+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "Failed to clear the mappings." + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "Failed to delete the server configuration" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "The configuration is valid and the connection could be established!" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "The configuration is valid, but the Bind failed. Please check the server settings and credentials." + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "The configuration is invalid. Please look in the ownCloud log for further details." + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "Deletion failed" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "Take over settings from recent server configuration?" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "Keep settings?" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "Cannot add server configuration" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "mappings cleared" + +#: js/settings.js:112 +msgid "Success" +msgstr "Success" + +#: js/settings.js:117 +msgid "Error" +msgstr "Error" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "Connection test succeeded" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "Connection test failed" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "Do you really want to delete the current Server Configuration?" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "Confirm Deletion" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "Server configuration" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "Add Server Configuration" + +#: templates/settings.php:37 +msgid "Host" +msgstr "Host" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "You can omit the protocol, except you require SSL. Then start with ldaps://" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "Base DN" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "One Base DN per line" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "You can specify Base DN for users and groups in the Advanced tab" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "User DN" + +#: templates/settings.php:46 +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 "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." + +#: templates/settings.php:47 +msgid "Password" +msgstr "Password" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "For anonymous access, leave DN and Password empty." + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "User Login Filter" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "User List Filter" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "Group Filter" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "Connection Settings" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "Configuration Active" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "When unchecked, this configuration will be skipped." + +#: templates/settings.php:69 +msgid "Port" +msgstr "Port" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "Backup (Replica) Host" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "Give an optional backup host. It must be a replica of the main LDAP/AD server." + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "Backup (Replica) Port" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "Disable Main Server" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "Only connect to the replica server." + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "Use TLS" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "Do not use it additionally for LDAPS connections, it will fail." + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "Case insensitve LDAP server (Windows)" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "Turn off SSL certificate validation." + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "Cache Time-To-Live" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "in seconds. A change empties the cache." + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "Directory Settings" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "User Display Name Field" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "The LDAP attribute to use to generate the user's display name." + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "Base User Tree" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "One User Base DN per line" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "User Search Attributes" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "Optional; one attribute per line" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "Group Display Name Field" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "The LDAP attribute to use to generate the group's display name." + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "Base Group Tree" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "One Group Base DN per line" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "Group Search Attributes" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "Group-Member association" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "Special Attributes" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "Quota Field" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "Quota Default" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "in bytes" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "Email Field" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "User Home Folder Naming Rule" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "Internal Username" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "Internal Username Attribute:" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "Override UUID detection" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "UUID Attribute:" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "Username-LDAP User Mapping" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "Clear Username-LDAP User Mapping" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "Clear Groupname-LDAP Group Mapping" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "Test Configuration" + +#: templates/settings.php:108 +msgid "Help" +msgstr "Help" diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po new file mode 100644 index 00000000000..210787a40fa --- /dev/null +++ b/l10n/en_GB/user_webdavauth.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: +# mnestis , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-29 16:40+0000\n" +"Last-Translator: mnestis \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "WebDAV Authentication" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "Address: " + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." diff --git a/l10n/eo/core.po b/l10n/eo/core.po index a11e637c695..1c4e9c35417 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s kunhavigis “%s” kun vi" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Persona" msgid "Users" msgstr "Uzantoj" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikaĵoj" @@ -602,10 +606,6 @@ msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi." msgid "Log out" msgstr "Elsaluti" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "La aŭtomata ensaluto malakceptiĝis!" @@ -620,19 +620,19 @@ msgstr "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas! msgid "Please change your password to secure your account again." msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ĉu vi perdis vian pasvorton?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "memori" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Ensaluti" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternativaj ensalutoj" diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 6ca34ebb812..af8d82e0aab 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Malsukcesis skribo al disko" msgid "Not enough storage available" msgstr "Ne haveblas sufiĉa memoro" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Nevalida dosierujo." @@ -95,20 +99,20 @@ msgstr "Ne haveblas sufiĉa spaco" msgid "Upload cancelled." msgstr "La alŝuto nuliĝis." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL ne povas esti malplena." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Eraro" @@ -124,41 +128,57 @@ msgstr "Forigi por ĉiam" msgid "Rename" msgstr "Alinomigi" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Traktotaj" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} jam ekzistas" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "anstataŭigi" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugesti nomon" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "nuligi" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "anstataŭiĝis {new_name} per {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "malfari" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "dosieroj estas alŝutataj" @@ -208,18 +228,6 @@ msgstr "Grando" msgid "Modified" msgstr "Modifita" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "Dosieroj estas skanataj, bonvolu atendi." msgid "Current scanning" msgstr "Nuna skano" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "dosiero" - -#: templates/part.list.php:87 -msgid "files" -msgstr "dosieroj" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..." diff --git a/l10n/es/core.po b/l10n/es/core.po index ebe8564fa85..d700f044722 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -31,6 +31,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s compatido »%s« contigo" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -476,7 +480,7 @@ msgstr "Personal" msgid "Users" msgstr "Usuarios" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicaciones" @@ -609,10 +613,6 @@ msgstr "%s esta disponible. Obtener mas información de como actualizar." msgid "Log out" msgstr "Salir" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "¡Inicio de sesión automático rechazado!" @@ -627,19 +627,19 @@ msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cue msgid "Please change your password to secure your account again." msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "¿Ha perdido su contraseña?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "recordar" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Entrar" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Inicios de sesión alternativos" diff --git a/l10n/es/files.po b/l10n/es/files.po index b396e770812..764ab8c2f26 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -79,7 +79,11 @@ msgstr "Falló al escribir al disco" msgid "Not enough storage available" msgstr "No hay suficiente espacio disponible" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Directorio inválido." @@ -99,20 +103,20 @@ msgstr "No hay suficiente espacio disponible" msgid "Upload cancelled." msgstr "Subida cancelada." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Error" @@ -128,41 +132,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renombrar" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendiente" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "reemplazado {new_name} con {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "deshacer" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "subiendo archivos" @@ -212,18 +232,6 @@ msgstr "Tamaño" msgid "Modified" msgstr "Modificado" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -327,22 +335,6 @@ msgstr "Los archivos están siendo escaneados, por favor espere." msgid "Current scanning" msgstr "Escaneo actual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "carpeta" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "carpetas" - -#: templates/part.list.php:85 -msgid "file" -msgstr "archivo" - -#: templates/part.list.php:87 -msgid "files" -msgstr "archivos" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Actualizando caché del sistema de archivos" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 06f8c7904dd..ee3f80addf2 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s compartió \"%s\" con vos" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "Personal" msgid "Users" msgstr "Usuarios" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -601,10 +605,6 @@ msgstr "%s está disponible. Obtené más información sobre cómo actualizar." msgid "Log out" msgstr "Cerrar la sesión" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "¡El inicio de sesión automático fue rechazado!" @@ -619,19 +619,19 @@ msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta msgid "Please change your password to secure your account again." msgstr "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "¿Perdiste tu contraseña?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "recordame" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Iniciar sesión" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Nombre alternativos de usuarios" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 013ab1b95dd..9e7e5a0922a 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -5,12 +5,13 @@ # Translators: # Agustin Ferrario , 2013 # cjtess , 2013 +# juliabis, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +77,11 @@ msgstr "Error al escribir en el disco" msgid "Not enough storage available" msgstr "No hay suficiente almacenamiento" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Directorio inválido." @@ -96,20 +101,20 @@ msgstr "No hay suficiente espacio disponible" msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Error" @@ -125,41 +130,57 @@ msgstr "Borrar permanentemente" msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendientes" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "se reemplazó {new_name} con {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "deshacer" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "Subiendo archivos" @@ -189,7 +210,7 @@ msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos." #: js/files.js:245 msgid "" @@ -209,18 +230,6 @@ msgstr "Tamaño" msgid "Modified" msgstr "Modificado" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +333,6 @@ msgstr "Se están escaneando los archivos, por favor esperá." msgid "Current scanning" msgstr "Escaneo actual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "directorio" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "directorios" - -#: templates/part.list.php:85 -msgid "file" -msgstr "archivo" - -#: templates/part.list.php:87 -msgid "files" -msgstr "archivos" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Actualizando el cache del sistema de archivos" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 0af60809ed1..7b3a992357f 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-28 09:30+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s jagas sinuga »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "Haldusreziimis" @@ -469,7 +473,7 @@ msgstr "Isiklik" msgid "Users" msgstr "Kasutajad" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Rakendused" @@ -602,10 +606,6 @@ msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada." msgid "Log out" msgstr "Logi välja" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Rohkem rakendusi" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automaatne sisselogimine lükati tagasi!" @@ -620,19 +620,19 @@ msgstr "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla msgid "Please change your password to secure your account again." msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Kaotasid oma parooli?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "pea meeles" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Logi sisse" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatiivsed sisselogimisviisid" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 647475a3a19..f69d10f72ec 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Kettale kirjutamine ebaõnnestus" msgid "Not enough storage available" msgstr "Saadaval pole piisavalt ruumi" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Vigane kaust." @@ -96,20 +100,20 @@ msgstr "Pole piisavalt ruumi" msgid "Upload cancelled." msgstr "Üleslaadimine tühistati." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL ei saa olla tühi." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Viga" @@ -125,41 +129,57 @@ msgstr "Kustuta jäädavalt" msgid "Rename" msgstr "Nimeta ümber" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ootel" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} on juba olemas" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "asenda" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "soovita nime" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "loobu" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "asendas nime {old_name} nimega {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "tagasi" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n kataloog" +msgstr[1] "%n kataloogi" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n fail" +msgstr[1] "%n faili" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laadin üles %n faili" msgstr[1] "Laadin üles %n faili" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "faili üleslaadimisel" @@ -209,18 +229,6 @@ msgstr "Suurus" msgid "Modified" msgstr "Muudetud" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n kataloog" -msgstr[1] "%n kataloogi" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n fail" -msgstr[1] "%n faili" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Faile skannitakse, palun oota." msgid "Current scanning" msgstr "Praegune skannimine" -#: templates/part.list.php:74 -msgid "directory" -msgstr "kaust" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "kaustad" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fail" - -#: templates/part.list.php:87 -msgid "files" -msgstr "faili" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Failisüsteemi puhvri uuendamine..." diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 12ed7b71d2b..004b38fc512 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s-ek »%s« zurekin partekatu du" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Pertsonala" msgid "Users" msgstr "Erabiltzaileak" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikazioak" @@ -602,10 +606,6 @@ msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu." msgid "Log out" msgstr "Saioa bukatu" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "App gehiago" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Saio hasiera automatikoa ez onartuta!" @@ -620,19 +620,19 @@ msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan msgid "Please change your password to secure your account again." msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Galdu duzu pasahitza?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "gogoratu" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Hasi saioa" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Beste erabiltzaile izenak" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 878b37729c7..bb64b84c230 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Errore bat izan da diskoan idazterakoan" msgid "Not enough storage available" msgstr "Ez dago behar aina leku erabilgarri," -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Baliogabeko karpeta." @@ -96,20 +100,20 @@ msgstr "Ez dago leku nahikorik." msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URLa ezin da hutsik egon." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Errorea" @@ -125,41 +129,57 @@ msgstr "Ezabatu betirako" msgid "Rename" msgstr "Berrizendatu" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Zain" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} dagoeneko existitzen da" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr " {new_name}-k {old_name} ordezkatu du" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "desegin" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "karpeta %n" +msgstr[1] "%n karpeta" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "fitxategi %n" +msgstr[1] "%n fitxategi" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Fitxategi %n igotzen" msgstr[1] "%n fitxategi igotzen" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fitxategiak igotzen" @@ -209,18 +229,6 @@ msgstr "Tamaina" msgid "Modified" msgstr "Aldatuta" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "karpeta %n" -msgstr[1] "%n karpeta" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "fitxategi %n" -msgstr[1] "%n fitxategi" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." msgid "Current scanning" msgstr "Orain eskaneatzen ari da" -#: templates/part.list.php:74 -msgid "directory" -msgstr "direktorioa" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "direktorioak" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fitxategia" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fitxategiak" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Fitxategi sistemaren katxea eguneratzen..." diff --git a/l10n/fa/core.po b/l10n/fa/core.po index 570d7e6c1ec..4fb8afd07bb 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -464,7 +468,7 @@ msgstr "شخصی" msgid "Users" msgstr "کاربران" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr " برنامه ها" @@ -597,10 +601,6 @@ msgstr "%s در دسترس است. برای چگونگی به روز رسانی msgid "Log out" msgstr "خروج" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "ورود به سیستم اتوماتیک ردشد!" @@ -615,19 +615,19 @@ msgstr "اگر شما اخیرا رمزعبور را تغییر نداده ای msgid "Please change your password to secure your account again." msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا حساب شما در امان باشد." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "آیا گذرواژه تان را به یاد نمی آورید؟" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "بیاد آوری" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "ورود" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "ورود متناوب" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 4487cf2fcb0..362a1dc80ae 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود" msgid "Not enough storage available" msgstr "فضای کافی در دسترس نیست" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "فهرست راهنما نامعتبر می باشد." @@ -95,20 +99,20 @@ msgstr "فضای کافی در دسترس نیست" msgid "Upload cancelled." msgstr "بار گذاری لغو شد" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. " -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL نمی تواند خالی باشد." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "خطا" @@ -124,40 +128,54 @@ msgstr "حذف قطعی" msgid "Rename" msgstr "تغییرنام" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "در انتظار" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{نام _جدید} در حال حاضر وجود دارد." -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "جایگزین" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "پیشنهاد نام" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "لغو" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد." -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "بازگشت" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "بارگذاری فایل ها" @@ -207,16 +225,6 @@ msgstr "اندازه" msgid "Modified" msgstr "تاریخ" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -320,22 +328,6 @@ msgstr "پرونده ها در حال بازرسی هستند لطفا صبر ک msgid "Current scanning" msgstr "بازرسی کنونی" -#: templates/part.list.php:74 -msgid "directory" -msgstr "پوشه" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "پوشه ها" - -#: templates/part.list.php:85 -msgid "file" -msgstr "پرونده" - -#: templates/part.list.php:87 -msgid "files" -msgstr "پرونده ها" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "بهبود فایل سیستمی ذخیره گاه..." diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index aee3205f289..56d1039db0f 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-28 06:40+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s jakoi kohteen »%s« kanssasi" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "Siirrytty ylläpitotilaan" @@ -469,7 +473,7 @@ msgstr "Henkilökohtainen" msgid "Users" msgstr "Käyttäjät" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Sovellukset" @@ -602,10 +606,6 @@ msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan." msgid "Log out" msgstr "Kirjaudu ulos" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Lisää sovelluksia" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automaattinen sisäänkirjautuminen hylättiin!" @@ -620,19 +620,19 @@ msgstr "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu." msgid "Please change your password to secure your account again." msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Unohditko salasanasi?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "muista" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Kirjaudu sisään" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Vaihtoehtoiset kirjautumiset" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index cd30a9df4bf..69f2485ac90 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Levylle kirjoitus epäonnistui" msgid "Not enough storage available" msgstr "Tallennustilaa ei ole riittävästi käytettävissä" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Virheellinen kansio." @@ -95,20 +99,20 @@ msgstr "Tilaa ei ole riittävästi" msgid "Upload cancelled." msgstr "Lähetys peruttu." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Verkko-osoite ei voi olla tyhjä" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Virhe" @@ -124,41 +128,57 @@ msgstr "Poista pysyvästi" msgid "Rename" msgstr "Nimeä uudelleen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Odottaa" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} on jo olemassa" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "korvaa" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "ehdota nimeä" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "peru" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "kumoa" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n kansio" +msgstr[1] "%n kansiota" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n tiedosto" +msgstr[1] "%n tiedostoa" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lähetetään %n tiedosto" msgstr[1] "Lähetetään %n tiedostoa" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -208,18 +228,6 @@ msgstr "Koko" msgid "Modified" msgstr "Muokattu" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n kansio" -msgstr[1] "%n kansiota" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n tiedosto" -msgstr[1] "%n tiedostoa" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "Tiedostoja tarkistetaan, odota hetki." msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" -#: templates/part.list.php:74 -msgid "directory" -msgstr "kansio" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "kansiota" - -#: templates/part.list.php:85 -msgid "file" -msgstr "tiedosto" - -#: templates/part.list.php:87 -msgid "files" -msgstr "tiedostoa" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Päivitetään tiedostojärjestelmän välimuistia..." diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 21591f1ea32..5aaca8e3f70 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -27,6 +27,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s partagé »%s« avec vous" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -472,7 +476,7 @@ msgstr "Personnel" msgid "Users" msgstr "Utilisateurs" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Applications" @@ -605,10 +609,6 @@ msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre msgid "Log out" msgstr "Se déconnecter" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Connexion automatique rejetée !" @@ -623,19 +623,19 @@ msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte r msgid "Please change your password to secure your account again." msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Mot de passe perdu ?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "se souvenir de moi" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Connexion" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Logins alternatifs" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 79cb84b3af2..bd1b9b97978 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Erreur d'écriture sur le disque" msgid "Not enough storage available" msgstr "Plus assez d'espace de stockage disponible" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Dossier invalide." @@ -97,20 +101,20 @@ msgstr "Espace disponible insuffisant" msgid "Upload cancelled." msgstr "Envoi annulé." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "L'URL ne peut-être vide" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Erreur" @@ -126,41 +130,57 @@ msgstr "Supprimer de façon définitive" msgid "Rename" msgstr "Renommer" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "En attente" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} existe déjà" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "remplacer" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Suggérer un nom" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "annuler" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} a été remplacé par {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "annuler" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fichiers en cours d'envoi" @@ -210,18 +230,6 @@ msgstr "Taille" msgid "Modified" msgstr "Modifié" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." msgid "Current scanning" msgstr "Analyse en cours" -#: templates/part.list.php:74 -msgid "directory" -msgstr "dossier" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "dossiers" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fichier" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fichiers" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Mise à niveau du cache du système de fichier" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index c594c9f86d7..ed5c0b1b091 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,30 +23,34 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s compartiu «%s» con vostede" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Modo de mantemento activado" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Modo de mantemento desactivado" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de datos actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualizando o ficheiro da caché, isto pode levar bastante tempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Ficheiro da caché actualizado" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% feito ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -468,7 +472,7 @@ msgstr "Persoal" msgid "Users" msgstr "Usuarios" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicativos" @@ -601,10 +605,6 @@ msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar. msgid "Log out" msgstr "Desconectar" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Máis aplicativos" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Rexeitouse a entrada automática" @@ -619,19 +619,19 @@ msgstr "Se non fixo recentemente cambios de contrasinal é posíbel que a súa c msgid "Please change your password to secure your account again." msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Perdeu o contrasinal?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "lembrar" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Conectar" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Accesos alternativos" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index ddf953cadeb..f655969e064 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Produciuse un erro ao escribir no disco" msgid "Not enough storage available" msgstr "Non hai espazo de almacenamento abondo" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "O directorio é incorrecto." @@ -95,20 +99,20 @@ msgstr "O espazo dispoñíbel é insuficiente" msgid "Upload cancelled." msgstr "Envío cancelado." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "O URL non pode quedar baleiro." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Erro" @@ -124,41 +128,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendentes" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "Xa existe un {new_name}" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "substituír" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "suxerir nome" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "substituír {new_name} por {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "desfacer" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n cartafol" +msgstr[1] "%n cartafoles" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n ficheiro" +msgstr[1] "%n ficheiros" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Cargando %n ficheiro" msgstr[1] "Cargando %n ficheiros" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "ficheiros enviándose" @@ -208,18 +228,6 @@ msgstr "Tamaño" msgid "Modified" msgstr "Modificado" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n cartafol" -msgstr[1] "%n cartafoles" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n ficheiro" -msgstr[1] "%n ficheiros" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "Estanse analizando os ficheiros. Agarde." msgid "Current scanning" msgstr "Análise actual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "directorio" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "directorios" - -#: templates/part.list.php:85 -msgid "file" -msgstr "ficheiro" - -#: templates/part.list.php:87 -msgid "files" -msgstr "ficheiros" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Anovando a caché do sistema de ficheiros..." diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index 08a5c665391..48006ace76f 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 08:30+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Non se especificou o nome do aplicativo" #: app.php:361 msgid "Help" @@ -87,59 +87,59 @@ msgstr "Descargue os ficheiros en cachos máis pequenos e por separado, ou pída #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Non foi especificada ningunha orixe ao instalar aplicativos" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Non foi especificada ningunha href ao instalar aplicativos" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Os arquivos do tipo %s non están admitidos" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Non foi posíbel abrir o arquivo ao instalar aplicativos" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "O aplicativo non fornece un ficheiro info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Non é posíbel instalar o aplicativo por mor de conter código non permitido" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud." #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta\n\n\ntrue\n\nque non está permitida para os aplicativos non enviados" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Xa existe o directorio do aplicativo" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index fda92370b33..e04bf9e31b2 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-28 22:30+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,47 +85,47 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s" msgid "Couldn't update app." msgstr "Non foi posíbel actualizar o aplicativo." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar á {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactivar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Agarde..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Produciuse un erro ao desactivar o aplicativo" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Produciuse un erro ao activar o aplicativo" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Actualizando..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Produciuse un erro mentres actualizaba o aplicativo" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Erro" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizado" diff --git a/l10n/he/core.po b/l10n/he/core.po index 6ec8af7aaf4..ccf747517c2 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s שיתף/שיתפה איתך את »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "אישי" msgid "Users" msgstr "משתמשים" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "יישומים" @@ -602,10 +606,6 @@ msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע msgid "Log out" msgstr "התנתקות" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "יישומים נוספים" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "בקשת הכניסה האוטומטית נדחתה!" @@ -620,19 +620,19 @@ msgstr "אם לא שינית את ססמתך לאחרונה, יתכן שחשבו msgid "Please change your password to secure your account again." msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "שכחת את ססמתך?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "שמירת הססמה" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "כניסה" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "כניסות אלטרנטיביות" diff --git a/l10n/he/files.po b/l10n/he/files.po index 3d889a55126..9002e898ceb 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "הכתיבה לכונן נכשלה" msgid "Not enough storage available" msgstr "אין די שטח פנוי באחסון" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "תיקייה שגויה." @@ -95,20 +99,20 @@ msgstr "" msgid "Upload cancelled." msgstr "ההעלאה בוטלה." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "קישור אינו יכול להיות ריק." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "שגיאה" @@ -124,41 +128,57 @@ msgstr "מחק לצמיתות" msgid "Rename" msgstr "שינוי שם" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "ממתין" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} כבר קיים" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "החלפה" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "הצעת שם" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ביטול" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} הוחלף ב־{old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "ביטול" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "קבצים בהעלאה" @@ -208,18 +228,6 @@ msgstr "גודל" msgid "Modified" msgstr "זמן שינוי" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "הקבצים נסרקים, נא להמתין." msgid "Current scanning" msgstr "הסריקה הנוכחית" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "קובץ" - -#: templates/part.list.php:87 -msgid "files" -msgstr "קבצים" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 4e3345632b4..479e61d7c60 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "यक्तिगत" msgid "Users" msgstr "उपयोगकर्ता" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -601,10 +605,6 @@ msgstr "" msgid "Log out" msgstr "लोग आउट" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -619,19 +619,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "याद रखें" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 0255297a18f..67aa5d887df 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "त्रुटि" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index 58b1610541c..693dc056589 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "Osobno" msgid "Users" msgstr "Korisnici" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikacije" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "Odjava" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -622,19 +622,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Izgubili ste lozinku?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "zapamtiti" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Prijava" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index ad81139bafe..b576a0b7cb1 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Neuspjelo pisanje na disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Slanje poništeno." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Greška" @@ -123,42 +127,60 @@ msgstr "" msgid "Rename" msgstr "Promjeni ime" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "U tijeku" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "zamjeni" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "predloži ime" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "odustani" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "vrati" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "datoteke se učitavaju" @@ -208,20 +230,6 @@ msgstr "Veličina" msgid "Modified" msgstr "Zadnja promjena" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Datoteke se skeniraju, molimo pričekajte." msgid "Current scanning" msgstr "Trenutno skeniranje" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "datoteka" - -#: templates/part.list.php:87 -msgid "files" -msgstr "datoteke" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index f0a3a78d4fd..85a6b3a0d1d 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s megosztotta Önnel ezt: »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Személyes" msgid "Users" msgstr "Felhasználók" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Alkalmazások" @@ -602,10 +606,6 @@ msgstr "%s rendelkezésre áll. További információ a frissítéshez." msgid "Log out" msgstr "Kilépés" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Az automatikus bejelentkezés sikertelen!" @@ -620,19 +620,19 @@ msgstr "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy i msgid "Please change your password to secure your account again." msgstr "A biztonsága érdekében változtassa meg a jelszavát!" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Elfelejtette a jelszavát?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "emlékezzen" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Bejelentkezés" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatív bejelentkezés" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 9ea607c824b..48876d9d474 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Nem sikerült a lemezre történő írás" msgid "Not enough storage available" msgstr "Nincs elég szabad hely." -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Érvénytelen mappa." @@ -95,20 +99,20 @@ msgstr "Nincs elég szabad hely" msgid "Upload cancelled." msgstr "A feltöltést megszakítottuk." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Az URL nem lehet semmi." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Hiba" @@ -124,41 +128,57 @@ msgstr "Végleges törlés" msgid "Rename" msgstr "Átnevezés" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} már létezik" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "írjuk fölül" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "legyen más neve" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "mégse" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "visszavonás" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fájl töltődik föl" @@ -208,18 +228,6 @@ msgstr "Méret" msgid "Modified" msgstr "Módosítva" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" msgid "Current scanning" msgstr "Ellenőrzés alatt" -#: templates/part.list.php:74 -msgid "directory" -msgstr "mappa" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "mappa" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fájl" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fájlok" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "A fájlrendszer gyorsítótárának frissítése zajlik..." diff --git a/l10n/hy/core.po b/l10n/hy/core.po index 22460f69ddf..9d22bb2fd79 100644 --- a/l10n/hy/core.po +++ b/l10n/hy/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/hy/files.po b/l10n/hy/files.po index e645c744ff4..6c477202b4d 100644 --- a/l10n/hy/files.po +++ b/l10n/hy/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 72f712753e1..7dfa76c49ea 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "Personal" msgid "Users" msgstr "Usatores" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Applicationes" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "Clauder le session" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Tu perdeva le contrasigno?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "memora" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Aperir session" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 6000c6cf607..97ce4fab714 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Error" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "Dimension" msgid "Modified" msgstr "Modificate" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/id/core.po b/l10n/id/core.po index c42fea70e82..51d44b0f572 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "Pribadi" msgid "Users" msgstr "Pengguna" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikasi" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "Keluar" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Masuk otomatis ditolak!" @@ -614,19 +614,19 @@ msgstr "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin d msgid "Please change your password to secure your account again." msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Lupa sandi?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "selalu masuk" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Masuk" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Cara Alternatif untuk Masuk" diff --git a/l10n/id/files.po b/l10n/id/files.po index 467e1dd2a34..5d512ec38db 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Gagal menulis ke disk" msgid "Not enough storage available" msgstr "Ruang penyimpanan tidak mencukupi" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Direktori tidak valid." @@ -94,20 +98,20 @@ msgstr "Ruang penyimpanan tidak mencukupi" msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL tidak boleh kosong" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Galat" @@ -123,40 +127,54 @@ msgstr "Hapus secara permanen" msgid "Rename" msgstr "Ubah nama" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Menunggu" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} sudah ada" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ganti" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sarankan nama" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "batalkan" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "mengganti {new_name} dengan {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "urungkan" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "berkas diunggah" @@ -206,16 +224,6 @@ msgstr "Ukuran" msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "Berkas sedang dipindai, silakan tunggu." msgid "Current scanning" msgstr "Yang sedang dipindai" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "berkas" - -#: templates/part.list.php:87 -msgid "files" -msgstr "berkas-berkas" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Meningkatkan tembolok sistem berkas..." diff --git a/l10n/is/core.po b/l10n/is/core.po index 428ebc7861c..643a8c16821 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "Um mig" msgid "Users" msgstr "Notendur" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Forrit" @@ -601,10 +605,6 @@ msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir." msgid "Log out" msgstr "Útskrá" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Sjálfvirkri innskráningu hafnað!" @@ -619,19 +619,19 @@ msgstr "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt a msgid "Please change your password to secure your account again." msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Týndir þú lykilorðinu?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "muna eftir mér" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Skrá inn" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/is/files.po b/l10n/is/files.po index 64dc57bc97f..10e1d535f40 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Tókst ekki að skrifa á disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ógild mappa." @@ -94,20 +98,20 @@ msgstr "Ekki nægt pláss tiltækt" msgid "Upload cancelled." msgstr "Hætt við innsendingu." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Vefslóð má ekki vera tóm." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Villa" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "Endurskýra" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Bíður" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} er þegar til" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "yfirskrifa" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "stinga upp á nafni" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "hætta við" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "yfirskrifaði {new_name} með {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "afturkalla" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "Stærð" msgid "Modified" msgstr "Breytt" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Verið er að skima skrár, vinsamlegast hinkraðu." msgid "Current scanning" msgstr "Er að skima" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/it/core.po b/l10n/it/core.po index 154aa4c3266..9a45ffabc38 100644 --- a/l10n/it/core.po +++ b/l10n/it/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -25,30 +25,34 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s ha condiviso «%s» con te" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Modalità di manutenzione attivata" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Modalità di manutenzione disattivata" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Database aggiornato" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Cache dei file aggiornata" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% completato ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -470,7 +474,7 @@ msgstr "Personale" msgid "Users" msgstr "Utenti" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Applicazioni" @@ -603,10 +607,6 @@ msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento." msgid "Log out" msgstr "Esci" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Altre applicazioni" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Accesso automatico rifiutato." @@ -621,19 +621,19 @@ msgstr "Se non hai cambiato la password recentemente, il tuo account potrebbe es msgid "Please change your password to secure your account again." msgstr "Cambia la password per rendere nuovamente sicuro il tuo account." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Hai perso la password?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "ricorda" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Accedi" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Accessi alternativi" diff --git a/l10n/it/files.po b/l10n/it/files.po index 465bb80784f..6b88648425a 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Scrittura su disco non riuscita" msgid "Not enough storage available" msgstr "Spazio di archiviazione insufficiente" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Cartella non valida." @@ -96,20 +100,20 @@ msgstr "Spazio disponibile insufficiente" msgid "Upload cancelled." msgstr "Invio annullato" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "L'URL non può essere vuoto." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Errore" @@ -125,41 +129,57 @@ msgstr "Elimina definitivamente" msgid "Rename" msgstr "Rinomina" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "In corso" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} esiste già" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "sostituisci" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "suggerisci nome" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "annulla" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "sostituito {new_name} con {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "annulla" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n cartella" +msgstr[1] "%n cartelle" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n file" +msgstr[1] "%n file" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Caricamento di %n file in corso" msgstr[1] "Caricamento di %n file in corso" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "caricamento file" @@ -209,18 +229,6 @@ msgstr "Dimensione" msgid "Modified" msgstr "Modificato" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n cartella" -msgstr[1] "%n cartelle" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n file" -msgstr[1] "%n file" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Scansione dei file in corso, attendi" msgid "Current scanning" msgstr "Scansione corrente" -#: templates/part.list.php:74 -msgid "directory" -msgstr "cartella" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "cartelle" - -#: templates/part.list.php:85 -msgid "file" -msgstr "file" - -#: templates/part.list.php:87 -msgid "files" -msgstr "file" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Aggiornamento della cache del filesystem in corso..." diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 84dacdb52d2..e119006c71e 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-29 19:30+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" @@ -24,11 +24,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Il nome dell'applicazione non è specificato" #: app.php:361 msgid "Help" @@ -88,38 +88,38 @@ msgstr "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo am #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nessuna fonte specificata durante l'installazione dell'applicazione" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nessun href specificato durante l'installazione dell'applicazione da http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nessun percorso specificato durante l'installazione dell'applicazione da file locale" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Gli archivi di tipo %s non sono supportati" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "L'applicazione non fornisce un file info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud" #: installer.php:144 msgid "" @@ -131,16 +131,16 @@ msgstr "" msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "La cartella dell'applicazione esiste già" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 30dbfefeede..7effb5774b6 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -26,6 +26,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%sが あなたと »%s«を共有しました" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "個人" msgid "Users" msgstr "ユーザ" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "アプリ" @@ -600,10 +604,6 @@ msgstr "%s が利用可能です。更新方法に関してさらに情報を取 msgid "Log out" msgstr "ログアウト" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "他のアプリ" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "自動ログインは拒否されました！" @@ -618,19 +618,19 @@ msgstr "最近パスワードを変更していない場合、あなたのアカ msgid "Please change your password to secure your account again." msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "パスワードを忘れましたか？" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "パスワードを記憶する" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "ログイン" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "代替ログイン" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 92124283323..b8591173f30 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -79,7 +79,11 @@ msgstr "ディスクへの書き込みに失敗しました" msgid "Not enough storage available" msgstr "ストレージに十分な空き容量がありません" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "無効なディレクトリです。" @@ -99,20 +103,20 @@ msgstr "利用可能なスペースが十分にありません" msgid "Upload cancelled." msgstr "アップロードはキャンセルされました。" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URLは空にできません。" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "エラー" @@ -128,40 +132,54 @@ msgstr "完全に削除する" msgid "Rename" msgstr "名前の変更" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "中断" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} はすでに存在しています" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "置き換え" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} を {new_name} に置換" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n個のフォルダ" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n個のファイル" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個のファイルをアップロード中" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "ファイルをアップロード中" @@ -211,16 +229,6 @@ msgstr "サイズ" msgid "Modified" msgstr "変更" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n個のフォルダ" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n個のファイル" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "ファイルをスキャンしています、しばらくお待ちくだ msgid "Current scanning" msgstr "スキャン中" -#: templates/part.list.php:74 -msgid "directory" -msgstr "ディレクトリ" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "ディレクトリ" - -#: templates/part.list.php:85 -msgid "file" -msgstr "ファイル" - -#: templates/part.list.php:87 -msgid "files" -msgstr "ファイル" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "ファイルシステムキャッシュを更新中..." diff --git a/l10n/ka/core.po b/l10n/ka/core.po index d913c55a78d..d8e95837373 100644 --- a/l10n/ka/core.po +++ b/l10n/ka/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "პერსონა" msgid "Users" msgstr "მომხმარებლები" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -614,19 +614,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ka/files.po b/l10n/ka/files.po index 168581e96b0..8189ecec470 100644 --- a/l10n/ka/files.po +++ b/l10n/ka/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -206,16 +224,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index fc18e19a2f6..5611a467957 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "პირადი" msgid "Users" msgstr "მომხმარებელი" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "აპლიკაციები" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "გამოსვლა" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "ავტომატური შესვლა უარყოფილია!" @@ -614,19 +614,19 @@ msgstr "თუ თქვენ არ შეცვლით პაროლს, msgid "Please change your password to secure your account again." msgstr "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "დაგავიწყდათ პაროლი?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "დამახსოვრება" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "შესვლა" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "ალტერნატიული Login–ი" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index a2608f17952..b162233b9c0 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "შეცდომა დისკზე ჩაწერისას" msgid "Not enough storage available" msgstr "საცავში საკმარისი ადგილი არ არის" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "დაუშვებელი დირექტორია." @@ -94,20 +98,20 @@ msgstr "საკმარისი ადგილი არ არის" msgid "Upload cancelled." msgstr "ატვირთვა შეჩერებულ იქნა." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL არ შეიძლება იყოს ცარიელი." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "შეცდომა" @@ -123,40 +127,54 @@ msgstr "სრულად წაშლა" msgid "Rename" msgstr "გადარქმევა" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "მოცდის რეჟიმში" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} უკვე არსებობს" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "შეცვლა" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "სახელის შემოთავაზება" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "უარყოფა" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} შეცვლილია {old_name}–ით" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "დაბრუნება" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "ფაილები იტვირთება" @@ -206,16 +224,6 @@ msgstr "ზომა" msgid "Modified" msgstr "შეცვლილია" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "მიმდინარეობს ფაილების სკა msgid "Current scanning" msgstr "მიმდინარე სკანირება" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "ფაილური სისტემის ქეშის განახლება...." diff --git a/l10n/kn/core.po b/l10n/kn/core.po index 173c3cebfdf..7e2f5e0cca2 100644 --- a/l10n/kn/core.po +++ b/l10n/kn/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -614,19 +614,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/kn/files.po b/l10n/kn/files.po index 293b737fe12..59f02ce2c4f 100644 --- a/l10n/kn/files.po +++ b/l10n/kn/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -206,16 +224,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index fd2020b36d2..414603b41db 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -465,7 +469,7 @@ msgstr "개인" msgid "Users" msgstr "사용자" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "앱" @@ -598,10 +602,6 @@ msgstr "" msgid "Log out" msgstr "로그아웃" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "자동 로그인이 거부되었습니다!" @@ -616,19 +616,19 @@ msgstr "최근에 암호를 변경하지 않았다면 계정이 탈취되었을 msgid "Please change your password to secure your account again." msgstr "계정의 안전을 위하여 암호를 변경하십시오." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "암호를 잊으셨습니까?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "기억하기" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "로그인" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "대체 " diff --git a/l10n/ko/files.po b/l10n/ko/files.po index 6141204cfa2..f7c84013950 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Sungjin Gang , 2013 -# Sungjin Gang , 2013 +# ujuc Gang , 2013 +# ujuc Gang , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "디스크에 쓰지 못했습니다" msgid "Not enough storage available" msgstr "저장소가 용량이 충분하지 않습니다." -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "올바르지 않은 디렉터리입니다." @@ -96,20 +100,20 @@ msgstr "여유 공간이 부족합니다" msgid "Upload cancelled." msgstr "업로드가 취소되었습니다." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL을 입력해야 합니다." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "오류" @@ -125,40 +129,54 @@ msgstr "영원히 삭제" msgid "Rename" msgstr "이름 바꾸기" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "대기 중" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name}이(가) 이미 존재함" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "바꾸기" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "이름 제안" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "취소" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{old_name}이(가) {new_name}(으)로 대체됨" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "되돌리기" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "파일 업로드중" @@ -208,16 +226,6 @@ msgstr "크기" msgid "Modified" msgstr "수정됨" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -321,22 +329,6 @@ msgstr "파일을 검색하고 있습니다. 기다려 주십시오." msgid "Current scanning" msgstr "현재 검색" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "파일" - -#: templates/part.list.php:87 -msgid "files" -msgstr "파일" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "파일 시스템 캐시 업그레이드 중..." diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index 450c02ae9f9..1948a8cf5ea 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "به‌كارهێنه‌ر" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "به‌رنامه‌كان" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "چوونەدەرەوە" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index b8a21fbbfc6..b209e07c6f9 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "هه‌ڵه" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 90c54088503..6acfd95e044 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "Den/D' %s huet »%s« mat dir gedeelt" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "Perséinlech" msgid "Users" msgstr "Benotzer" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Applikatiounen" @@ -601,10 +605,6 @@ msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséi msgid "Log out" msgstr "Ofmellen" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatesch Umeldung ofgeleent!" @@ -619,19 +619,19 @@ msgstr "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Ac msgid "Please change your password to secure your account again." msgstr "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Passwuert vergiess?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "verhalen" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Umellen" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternativ Umeldungen" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 2b25a70819b..02542786a65 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Konnt net op den Disk schreiwen" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Upload ofgebrach." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fehler" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ofbriechen" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "réckgängeg man" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "Gréisst" msgid "Modified" msgstr "Geännert" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Fichieren gi gescannt, war weg." msgid "Current scanning" msgstr "Momentane Scan" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "Datei" - -#: templates/part.list.php:87 -msgid "files" -msgstr "Dateien" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index fba54c74e37..493b46ace2c 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -25,6 +25,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s pasidalino »%s« su tavimi" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -474,7 +478,7 @@ msgstr "Asmeniniai" msgid "Users" msgstr "Vartotojai" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Programos" @@ -607,10 +611,6 @@ msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą." msgid "Log out" msgstr "Atsijungti" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Daugiau programų" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatinis prisijungimas atmestas!" @@ -625,19 +625,19 @@ msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali msgid "Please change your password to secure your account again." msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Pamiršote slaptažodį?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "prisiminti" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Prisijungti" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatyvūs prisijungimai" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index d6f81df72fd..6fe0fe92913 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Nepavyko įrašyti į diską" msgid "Not enough storage available" msgstr "Nepakanka vietos serveryje" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Neteisingas aplankas" @@ -95,20 +99,20 @@ msgstr "Nepakanka vietos" msgid "Upload cancelled." msgstr "Įkėlimas atšauktas." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL negali būti tuščias." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Klaida" @@ -124,42 +128,60 @@ msgstr "Ištrinti negrįžtamai" msgid "Rename" msgstr "Pervadinti" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Laukiantis" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} jau egzistuoja" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "pakeisti" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "pasiūlyti pavadinimą" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "atšaukti" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "pakeiskite {new_name} į {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "anuliuoti" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "įkeliami failai" @@ -209,20 +231,6 @@ msgstr "Dydis" msgid "Modified" msgstr "Pakeista" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -326,22 +334,6 @@ msgstr "Skenuojami failai, prašome palaukti." msgid "Current scanning" msgstr "Šiuo metu skenuojama" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "failas" - -#: templates/part.list.php:87 -msgid "files" -msgstr "failai" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Atnaujinamas sistemos kešavimas..." diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 6d064f72ab8..689ad0da124 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s kopīgots »%s« ar jums" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -472,7 +476,7 @@ msgstr "Personīgi" msgid "Users" msgstr "Lietotāji" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Lietotnes" @@ -605,10 +609,6 @@ msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt." msgid "Log out" msgstr "Izrakstīties" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Vairāk programmu" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automātiskā ierakstīšanās ir noraidīta!" @@ -623,19 +623,19 @@ msgstr "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts msgid "Please change your password to secure your account again." msgstr "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Aizmirsāt paroli?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "atcerēties" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Ierakstīties" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatīvās pieteikšanās" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index a8d25e9c41d..5eff48359db 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Neizdevās saglabāt diskā" msgid "Not enough storage available" msgstr "Nav pietiekami daudz vietas" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Nederīga direktorija." @@ -95,20 +99,20 @@ msgstr "Nepietiek brīvas vietas" msgid "Upload cancelled." msgstr "Augšupielāde ir atcelta." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL nevar būt tukšs." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Kļūda" @@ -124,42 +128,60 @@ msgstr "Dzēst pavisam" msgid "Rename" msgstr "Pārsaukt" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Gaida savu kārtu" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} jau eksistē" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "aizvietot" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "ieteiktais nosaukums" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "atcelt" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "aizvietoja {new_name} ar {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "atsaukt" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n mapes" +msgstr[1] "%n mape" +msgstr[2] "%n mapes" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n faili" +msgstr[1] "%n fails" +msgstr[2] "%n faili" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n" msgstr[1] "Augšupielāde %n failu" msgstr[2] "Augšupielāde %n failus" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fails augšupielādējas" @@ -209,20 +231,6 @@ msgstr "Izmērs" msgid "Modified" msgstr "Mainīts" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n mapes" -msgstr[1] "%n mape" -msgstr[2] "%n mapes" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n faili" -msgstr[1] "%n fails" -msgstr[2] "%n faili" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -326,22 +334,6 @@ msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet." msgid "Current scanning" msgstr "Šobrīd tiek caurskatīts" -#: templates/part.list.php:74 -msgid "directory" -msgstr "direktorija" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "direktorijas" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fails" - -#: templates/part.list.php:87 -msgid "files" -msgstr "faili" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Uzlabo datņu sistēmas kešatmiņu..." diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 16a948973c7..c94527ab533 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "Лично" msgid "Users" msgstr "Корисници" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Аппликации" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "Одјава" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Одбиена автоматска најава!" @@ -618,19 +618,19 @@ msgstr "Ако не сте ја промениле лозинката во ск msgid "Please change your password to secure your account again." msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ја заборавивте лозинката?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "запамти" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Најава" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 32514622d6d..19942eb2ca5 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Неуспеав да запишам на диск" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Преземањето е прекинато." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Адресата неможе да биде празна." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Грешка" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "Преименувај" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Чека" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} веќе постои" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "замени" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "предложи име" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "откажи" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "заменета {new_name} со {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "врати" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "Големина" msgid "Modified" msgstr "Променето" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Се скенираат датотеки, ве молам почекај msgid "Current scanning" msgstr "Моментално скенирам" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "датотека" - -#: templates/part.list.php:87 -msgid "files" -msgstr "датотеки" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po index 9ad45f5453d..1e8a07eb01d 100644 --- a/l10n/ml_IN/core.po +++ b/l10n/ml_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po index 141b28bd760..6f1d3f841e5 100644 --- a/l10n/ml_IN/files.po +++ b/l10n/ml_IN/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 93497a4ddd9..0e3255b6ebe 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "Peribadi" msgid "Users" msgstr "Pengguna" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikasi" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "Log keluar" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -614,19 +614,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Hilang kata laluan?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "ingat" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Log masuk" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index a199e2b8aca..ce739248765 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Gagal untuk disimpan" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Muatnaik dibatalkan." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Ralat" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Dalam proses" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ganti" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "Batal" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -206,16 +224,6 @@ msgstr "Saiz" msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "Fail sedang diimbas, harap bersabar." msgid "Current scanning" msgstr "Imbasan semasa" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fail" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fail" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 9731f514725..4a7e283b44c 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "" msgid "Users" msgstr "သုံးစွဲသူ" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -614,19 +614,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "မှတ်မိစေသည်" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "ဝင်ရောက်ရန်" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po index b3e7927bbee..65da5b18778 100644 --- a/l10n/my_MM/files.po +++ b/l10n/my_MM/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -206,16 +224,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 39afa61d126..4bd2753d756 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s delte »%s« med deg" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "Personlig" msgid "Users" msgstr "Brukere" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apper" @@ -601,10 +605,6 @@ msgstr "" msgid "Log out" msgstr "Logg ut" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatisk pålogging avvist!" @@ -619,19 +619,19 @@ msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompr msgid "Please change your password to secure your account again." msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Mistet passordet ditt?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "husk" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Logg inn" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 4485c762012..c59874212be 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Klarte ikke å skrive til disk" msgid "Not enough storage available" msgstr "Ikke nok lagringsplass" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ugyldig katalog." @@ -97,20 +101,20 @@ msgstr "Ikke nok lagringsplass" msgid "Upload cancelled." msgstr "Opplasting avbrutt." -#: js/file-upload.js:167 +#: js/file-upload.js:165 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/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL-en kan ikke være tom." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Feil" @@ -126,41 +130,57 @@ msgstr "Slett permanent" msgid "Rename" msgstr "Gi nytt navn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ventende" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} finnes allerede" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "erstatt" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "erstattet {new_name} med {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "angre" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n mappe" +msgstr[1] "%n mapper" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n fil" +msgstr[1] "%n filer" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laster opp %n fil" msgstr[1] "Laster opp %n filer" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "filer lastes opp" @@ -210,18 +230,6 @@ msgstr "Størrelse" msgid "Modified" msgstr "Endret" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n mappe" -msgstr[1] "%n mapper" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n fil" -msgstr[1] "%n filer" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Skanner filer, vennligst vent." msgid "Current scanning" msgstr "Pågående skanning" -#: templates/part.list.php:74 -msgid "directory" -msgstr "katalog" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "kataloger" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fil" - -#: templates/part.list.php:87 -msgid "files" -msgstr "filer" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Oppgraderer filsystemets mellomlager..." diff --git a/l10n/ne/core.po b/l10n/ne/core.po index fe95a400040..5183d028931 100644 --- a/l10n/ne/core.po +++ b/l10n/ne/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ne/files.po b/l10n/ne/files.po index f5777db036d..16ee2747372 100644 --- a/l10n/ne/files.po +++ b/l10n/ne/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 29c60b93ffa..340455fdb1e 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -25,6 +25,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s deelde »%s« met jou" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -470,7 +474,7 @@ msgstr "Persoonlijk" msgid "Users" msgstr "Gebruikers" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -603,10 +607,6 @@ msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken." msgid "Log out" msgstr "Afmelden" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Meer applicaties" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatische aanmelding geweigerd!" @@ -621,19 +621,19 @@ msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overge msgid "Please change your password to secure your account again." msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Wachtwoord vergeten?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "onthoud gegevens" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Meld je aan" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatieve inlogs" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 963583df01e..1ef60e724ab 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Schrijven naar schijf mislukt" msgid "Not enough storage available" msgstr "Niet genoeg opslagruimte beschikbaar" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ongeldige directory." @@ -96,20 +100,20 @@ msgstr "Niet genoeg ruimte beschikbaar" msgid "Upload cancelled." msgstr "Uploaden geannuleerd." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL kan niet leeg zijn." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fout" @@ -125,41 +129,57 @@ msgstr "Verwijder definitief" msgid "Rename" msgstr "Hernoem" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "In behandeling" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} bestaat al" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "vervang" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Stel een naam voor" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "annuleren" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "verving {new_name} met {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "ongedaan maken" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "%n mappen" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "%n bestanden" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n bestand aan het uploaden" msgstr[1] "%n bestanden aan het uploaden" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "bestanden aan het uploaden" @@ -209,18 +229,6 @@ msgstr "Grootte" msgid "Modified" msgstr "Aangepast" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "%n mappen" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "%n bestanden" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Bestanden worden gescand, even wachten." msgid "Current scanning" msgstr "Er wordt gescand" -#: templates/part.list.php:74 -msgid "directory" -msgstr "directory" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "directories" - -#: templates/part.list.php:85 -msgid "file" -msgstr "bestand" - -#: templates/part.list.php:87 -msgid "files" -msgstr "bestanden" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Upgraden bestandssysteem cache..." diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 8a9fabb4afa..dd3e636cc48 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Personleg" msgid "Users" msgstr "Brukarar" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Program" @@ -602,10 +606,6 @@ msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer." msgid "Log out" msgstr "Logg ut" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatisk innlogging avvist!" @@ -620,19 +620,19 @@ msgstr "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompr msgid "Please change your password to secure your account again." msgstr "Ver venleg og endra passordet for å gjera kontoen din trygg igjen." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Gløymt passordet?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "hugs" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Logg inn" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternative innloggingar" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 1a2e3f21ed4..be3bfcba3ee 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Klarte ikkje skriva til disk" msgid "Not enough storage available" msgstr "Ikkje nok lagringsplass tilgjengeleg" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -96,20 +100,20 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg" msgid "Upload cancelled." msgstr "Opplasting avbroten." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Nettadressa kan ikkje vera tom." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Feil" @@ -125,41 +129,57 @@ msgstr "Slett for godt" msgid "Rename" msgstr "Endra namn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Under vegs" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} finst allereie" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "byt ut" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "føreslå namn" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "bytte ut {new_name} med {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "angre" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "filer lastar opp" @@ -209,18 +229,6 @@ msgstr "Storleik" msgid "Modified" msgstr "Endra" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Skannar filer, ver venleg og vent." msgid "Current scanning" msgstr "Køyrande skanning" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Oppgraderer mellomlageret av filsystemet …" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index f05370e6667..f419c3efaf3 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "Personal" msgid "Users" msgstr "Usancièrs" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Apps" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "Sortida" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "L'as perdut lo senhal ?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "bremba-te" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Dintrada" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/oc/files.po b/l10n/oc/files.po index 457161c53ac..d33b8a7f8a8 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "L'escriptura sul disc a fracassat" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "Amontcargar anullat." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. " -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Error" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "Torna nomenar" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Al esperar" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "remplaça" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "nom prepausat" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "anulla" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "defar" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fichièrs al amontcargar" @@ -207,18 +227,6 @@ msgstr "Talha" msgid "Modified" msgstr "Modificat" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Los fiichièrs son a èsser explorats, " msgid "Current scanning" msgstr "Exploracion en cors" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fichièr" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fichièrs" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 262ba294d29..edaed21e00e 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s Współdzielone »%s« z tobą" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -473,7 +477,7 @@ msgstr "Osobiste" msgid "Users" msgstr "Użytkownicy" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikacje" @@ -606,10 +610,6 @@ msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji." msgid "Log out" msgstr "Wyloguj" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Więcej aplikacji" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatyczne logowanie odrzucone!" @@ -624,19 +624,19 @@ msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożon msgid "Please change your password to secure your account again." msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Nie pamiętasz hasła?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "pamiętaj" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Zaloguj" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatywne loginy" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 201660307ed..fc486609894 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Błąd zapisu na dysk" msgid "Not enough storage available" msgstr "Za mało dostępnego miejsca" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Zła ścieżka." @@ -96,20 +100,20 @@ msgstr "Za mało miejsca" msgid "Upload cancelled." msgstr "Wczytywanie anulowane." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL nie może być pusty." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Błąd" @@ -125,42 +129,60 @@ msgstr "Trwale usuń" msgid "Rename" msgstr "Zmień nazwę" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Oczekujące" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} już istnieje" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "zastąp" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "zasugeruj nazwę" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "anuluj" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "zastąpiono {new_name} przez {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "cofnij" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "pliki wczytane" @@ -210,20 +232,6 @@ msgstr "Rozmiar" msgid "Modified" msgstr "Modyfikacja" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -327,22 +335,6 @@ msgstr "Skanowanie plików, proszę czekać." msgid "Current scanning" msgstr "Aktualnie skanowane" -#: templates/part.list.php:74 -msgid "directory" -msgstr "Katalog" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "Katalogi" - -#: templates/part.list.php:85 -msgid "file" -msgstr "plik" - -#: templates/part.list.php:87 -msgid "files" -msgstr "pliki" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Uaktualnianie plików pamięci podręcznej..." diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index f39dcf53868..44989e4aad8 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s compartilhou »%s« com você" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Pessoal" msgid "Users" msgstr "Usuários" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicações" @@ -602,10 +606,6 @@ msgstr "%s está disponível. Obtenha mais informações sobre como atualizar." msgid "Log out" msgstr "Sair" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Mais aplicativos" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Entrada Automática no Sistema Rejeitada!" @@ -620,19 +620,19 @@ msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar com msgid "Please change your password to secure your account again." msgstr "Por favor troque sua senha para tornar sua conta segura novamente." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Esqueceu sua senha?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "lembrar" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Fazer login" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Logins alternativos" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 1b16070f4ea..5f0718ae9da 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Falha ao escrever no disco" msgid "Not enough storage available" msgstr "Espaço de armazenamento insuficiente" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Diretório inválido." @@ -97,20 +101,20 @@ msgstr "Espaço de armazenamento insuficiente" msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL não pode ficar em branco" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Erro" @@ -126,41 +130,57 @@ msgstr "Excluir permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} já existe" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "substituir" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugerir nome" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "Substituído {old_name} por {new_name} " -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "desfazer" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "enviando arquivos" @@ -210,18 +230,6 @@ msgstr "Tamanho" msgid "Modified" msgstr "Modificado" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Arquivos sendo escaneados, por favor aguarde." msgid "Current scanning" msgstr "Scanning atual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "diretório" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "diretórios" - -#: templates/part.list.php:85 -msgid "file" -msgstr "arquivo" - -#: templates/part.list.php:87 -msgid "files" -msgstr "arquivos" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Atualizando cache do sistema de arquivos..." diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 75b60246ea5..e188e5ccc38 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -26,6 +26,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s partilhado »%s« contigo" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "Pessoal" msgid "Users" msgstr "Utilizadores" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicações" @@ -604,10 +608,6 @@ msgstr "%s está disponível. Tenha mais informações como actualizar." msgid "Log out" msgstr "Sair" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Login automático rejeitado!" @@ -622,19 +622,19 @@ msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sid msgid "Please change your password to secure your account again." msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Esqueceu-se da sua password?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "lembrar" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Entrar" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Contas de acesso alternativas" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 8d4a96c779c..78b08930414 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -76,7 +76,11 @@ msgstr "Falhou a escrita no disco" msgid "Not enough storage available" msgstr "Não há espaço suficiente em disco" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Directório Inválido" @@ -96,20 +100,20 @@ msgstr "Espaço em disco insuficiente!" msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "O URL não pode estar vazio." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Erro" @@ -125,41 +129,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "O nome {new_name} já existe" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "substituir" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugira um nome" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "substituido {new_name} por {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "desfazer" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "A enviar os ficheiros" @@ -209,18 +229,6 @@ msgstr "Tamanho" msgid "Modified" msgstr "Modificado" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -324,22 +332,6 @@ msgstr "Os ficheiros estão a ser analisados, por favor aguarde." msgid "Current scanning" msgstr "Análise actual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "diretório" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "diretórios" - -#: templates/part.list.php:85 -msgid "file" -msgstr "ficheiro" - -#: templates/part.list.php:87 -msgid "files" -msgstr "ficheiros" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Atualizar cache do sistema de ficheiros..." diff --git a/l10n/ro/core.po b/l10n/ro/core.po index c59794b27a9..93a50da14d5 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -26,6 +26,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s Partajat »%s« cu tine de" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -475,7 +479,7 @@ msgstr "Personal" msgid "Users" msgstr "Utilizatori" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplicații" @@ -608,10 +612,6 @@ msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actual msgid "Log out" msgstr "Ieșire" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Autentificare automată respinsă!" @@ -626,19 +626,19 @@ msgstr "Dacă nu ți-ai schimbat parola recent, contul tău ar putea fi compromi msgid "Please change your password to secure your account again." msgstr "Te rog schimbă-ți parola pentru a-ți securiza din nou contul." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ai uitat parola?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "amintește" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Autentificare" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Conectări alternative" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 83791045a81..6c1b9795dad 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Eroare la scriere pe disc" msgid "Not enough storage available" msgstr "Nu este suficient spațiu disponibil" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Director invalid." @@ -97,20 +101,20 @@ msgstr "Nu este suficient spațiu disponibil" msgid "Upload cancelled." msgstr "Încărcare anulată." -#: js/file-upload.js:167 +#: js/file-upload.js:165 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/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Adresa URL nu poate fi goală." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Eroare" @@ -126,42 +130,60 @@ msgstr "Stergere permanenta" msgid "Rename" msgstr "Redenumire" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "În așteptare" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} deja exista" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "înlocuire" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugerează nume" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "anulare" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} inlocuit cu {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "Anulează ultima acțiune" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "fișiere se încarcă" @@ -211,20 +233,6 @@ msgstr "Dimensiune" msgid "Modified" msgstr "Modificat" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -328,22 +336,6 @@ msgstr "Fișierele sunt scanate, te rog așteptă." msgid "Current scanning" msgstr "În curs de scanare" -#: templates/part.list.php:74 -msgid "directory" -msgstr "catalog" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "cataloage" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fișier" - -#: templates/part.list.php:87 -msgid "files" -msgstr "fișiere" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Modernizare fisiere de sistem cache.." diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 5766701217f..59c411b7209 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -30,6 +30,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s поделился »%s« с вами" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -479,7 +483,7 @@ msgstr "Личное" msgid "Users" msgstr "Пользователи" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Приложения" @@ -612,10 +616,6 @@ msgstr "%s доступно. Получить дополнительную ин msgid "Log out" msgstr "Выйти" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Ещё приложения" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Автоматический вход в систему отключен!" @@ -630,19 +630,19 @@ msgstr "Если Вы недавно не меняли свой пароль, т msgid "Please change your password to secure your account again." msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Забыли пароль?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "запомнить" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Войти" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Альтернативные имена пользователя" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 50051315f02..7a7e2c74f9e 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -79,7 +79,11 @@ msgstr "Ошибка записи на диск" msgid "Not enough storage available" msgstr "Недостаточно доступного места в хранилище" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Неправильный каталог." @@ -99,20 +103,20 @@ msgstr "Недостаточно свободного места" msgid "Upload cancelled." msgstr "Загрузка отменена." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Ссылка не может быть пустой." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Ошибка" @@ -128,42 +132,60 @@ msgstr "Удалено навсегда" msgid "Rename" msgstr "Переименовать" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Ожидание" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} уже существует" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "заменить" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "предложить название" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "отмена" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "заменено {new_name} на {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "отмена" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n папка" +msgstr[1] "%n папки" +msgstr[2] "%n папок" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n файл" +msgstr[1] "%n файла" +msgstr[2] "%n файлов" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Закачка %n файла" msgstr[1] "Закачка %n файлов" msgstr[2] "Закачка %n файлов" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "файлы загружаются" @@ -213,20 +235,6 @@ msgstr "Размер" msgid "Modified" msgstr "Изменён" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n папка" -msgstr[1] "%n папки" -msgstr[2] "%n папок" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n файл" -msgstr[1] "%n файла" -msgstr[2] "%n файлов" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -330,22 +338,6 @@ msgstr "Подождите, файлы сканируются." msgid "Current scanning" msgstr "Текущее сканирование" -#: templates/part.list.php:74 -msgid "directory" -msgstr "директория" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "директории" - -#: templates/part.list.php:85 -msgid "file" -msgstr "файл" - -#: templates/part.list.php:87 -msgid "files" -msgstr "файлы" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Обновление кэша файловой системы..." diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index c5c0acad459..613e0555003 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "පෞද්ගලික" msgid "Users" msgstr "පරිශීලකයන්" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "යෙදුම්" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "නික්මීම" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "මුරපදය අමතකද?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "මතක තබාගන්න" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "ප්‍රවේශවන්න" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index eaf1115c621..5a47ffe3d4d 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "උඩුගත කිරීම අත් හරින්න ලදී" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "යොමුව හිස් විය නොහැක" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "දෝෂයක්" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "නැවත නම් කරන්න" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ප්‍රතිස්ථාපනය කරන්න" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "නමක් යෝජනා කරන්න" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "අත් හරින්න" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "නිෂ්ප්‍රභ කරන්න" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "ප්‍රමාණය" msgid "Modified" msgstr "වෙනස් කළ" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳ msgid "Current scanning" msgstr "වර්තමාන පරික්ෂාව" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "ගොනුව" - -#: templates/part.list.php:87 -msgid "files" -msgstr "ගොනු" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/sk/core.po b/l10n/sk/core.po index 66e30ab46ba..921159e7c4d 100644 --- a/l10n/sk/core.po +++ b/l10n/sk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -622,19 +622,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/sk/files.po b/l10n/sk/files.po index 42edcfa625b..17be34bd16c 100644 --- a/l10n/sk/files.po +++ b/l10n/sk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,42 +127,60 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -208,20 +230,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index 83405bcf1c1..0c6bbe58a8c 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -4,12 +4,13 @@ # # Translators: # mhh , 2013 +# martin, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,30 +24,34 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s s Vami zdieľa »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Mód údržby zapnutý" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Mód údržby vypnutý" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Databáza aktualizovaná" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualizácia \"filecache\", toto môže trvať dlhšie..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "\"Filecache\" aktualizovaná" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% dokončených ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -472,7 +477,7 @@ msgstr "Osobné" msgid "Users" msgstr "Používatelia" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Aplikácie" @@ -605,10 +610,6 @@ msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce." msgid "Log out" msgstr "Odhlásiť" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Viac aplikácií" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatické prihlásenie bolo zamietnuté!" @@ -623,19 +624,19 @@ msgstr "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kom msgid "Please change your password to secure your account again." msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Zabudli ste heslo?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "zapamätať" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Prihlásiť sa" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatívne prihlasovanie" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 82282ef230f..6b81e2d7efe 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Zápis na disk sa nepodaril" msgid "Not enough storage available" msgstr "Nedostatok dostupného úložného priestoru" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Neplatný priečinok." @@ -95,20 +99,20 @@ msgstr "Nie je k dispozícii dostatok miesta" msgid "Upload cancelled." msgstr "Odosielanie zrušené." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL nemôže byť prázdne." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Chyba" @@ -124,42 +128,60 @@ msgstr "Zmazať trvalo" msgid "Rename" msgstr "Premenovať" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Prebieha" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} už existuje" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "nahradiť" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "pomôcť s menom" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "zrušiť" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "prepísaný {new_name} súborom {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "vrátiť" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n priečinok" +msgstr[1] "%n priečinky" +msgstr[2] "%n priečinkov" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n súbor" +msgstr[1] "%n súbory" +msgstr[2] "%n súborov" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávam %n súbor" msgstr[1] "Nahrávam %n súbory" msgstr[2] "Nahrávam %n súborov" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "nahrávanie súborov" @@ -209,20 +231,6 @@ msgstr "Veľkosť" msgid "Modified" msgstr "Upravené" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n priečinok" -msgstr[1] "%n priečinky" -msgstr[2] "%n priečinkov" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n súbor" -msgstr[1] "%n súbory" -msgstr[2] "%n súborov" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -326,22 +334,6 @@ msgstr "Čakajte, súbory sú prehľadávané." msgid "Current scanning" msgstr "Práve prezerané" -#: templates/part.list.php:74 -msgid "directory" -msgstr "priečinok" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "priečinky" - -#: templates/part.list.php:85 -msgid "file" -msgstr "súbor" - -#: templates/part.list.php:87 -msgid "files" -msgstr "súbory" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Aktualizujem medzipamäť súborového systému..." diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po index 40a9ba181d6..7353664590f 100644 --- a/l10n/sk_SK/files_encryption.po +++ b/l10n/sk_SK/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # mhh , 2013 +# martin, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-28 18:40+0000\n" +"Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,22 +61,22 @@ msgid "" "ownCloud system (e.g. your corporate directory). You can update your private" " key password in your personal settings to recover access to your encrypted " "files." -msgstr "" +msgstr "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom." #: hooks/hooks.php:41 msgid "Missing requirements." -msgstr "" +msgstr "Chýbajúce požiadavky." #: hooks/hooks.php:42 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná." #: hooks/hooks.php:249 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:" #: js/settings-admin.js:11 msgid "Saving..." @@ -89,7 +90,7 @@ msgstr "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené #: templates/invalid_private_key.php:7 msgid "You can unlock your private key in your " -msgstr "" +msgstr "Môžte odomknúť váš privátny kľúč v" #: templates/invalid_private_key.php:7 msgid "personal settings" @@ -102,11 +103,11 @@ msgstr "Šifrovanie" #: templates/settings-admin.php:10 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" -msgstr "" +msgstr "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):" #: templates/settings-admin.php:14 msgid "Recovery key password" -msgstr "" +msgstr "Heslo obnovovacieho kľúča" #: templates/settings-admin.php:21 templates/settings-personal.php:54 msgid "Enabled" @@ -118,15 +119,15 @@ msgstr "Zakázané" #: templates/settings-admin.php:34 msgid "Change recovery key password:" -msgstr "" +msgstr "Zmeniť heslo obnovovacieho kľúča:" #: templates/settings-admin.php:41 msgid "Old Recovery key password" -msgstr "" +msgstr "Staré heslo obnovovacieho kľúča" #: templates/settings-admin.php:48 msgid "New Recovery key password" -msgstr "" +msgstr "Nové heslo obnovovacieho kľúča" #: templates/settings-admin.php:53 msgid "Change Password" diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po index b40d282cddc..0bfa7fd164b 100644 --- a/l10n/sk_SK/lib.po +++ b/l10n/sk_SK/lib.po @@ -4,13 +4,14 @@ # # Translators: # mhh , 2013 +# martin, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-28 18:40+0000\n" +"Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +24,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Nešpecifikované meno aplikácie" #: app.php:361 msgid "Help" @@ -87,59 +88,59 @@ msgstr "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nešpecifikovaný zdroj pri inštalácii aplikácie" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Typ archívu %s nie je podporovaný" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Zlyhanie pri otváraní archívu počas inštalácie aplikácie" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Aplikácia neposkytuje súbor info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Aplikácia nemôže byť inštalovaná pretože obsahuje pravý štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Aplikačný adresár už existuje" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 456e726abfd..809ca007cb6 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -4,13 +4,14 @@ # # Translators: # mhh , 2013 +# martin, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-28 18:11+0000\n" +"Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,47 +86,47 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s" msgid "Couldn't update app." msgstr "Nemožno aktualizovať aplikáciu." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizovať na {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Zakázať" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Zapnúť" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Čakajte prosím..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Chyba pri zablokovaní aplikácie" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Chyba pri povoľovaní aplikácie" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aktualizujem..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "chyba pri aktualizácii aplikácie" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Chyba" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aktualizovať" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aktualizované" @@ -480,7 +481,7 @@ msgstr "Šifrovanie" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory" #: templates/personal.php:125 msgid "Log-in password" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index 0c495d4dbcc..df53e53b608 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/user_ldap.po @@ -4,13 +4,14 @@ # # Translators: # mhh , 2013 +# martin, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-28 18:21+0000\n" +"Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -156,7 +157,7 @@ msgstr "Filter prihlásenia používateľov" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -166,7 +167,7 @@ msgstr "Filter zoznamov používateľov" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"" #: templates/settings.php:59 msgid "Group Filter" @@ -176,7 +177,7 @@ msgstr "Filter skupiny" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -237,7 +238,7 @@ msgstr "Vypnúť overovanie SSL certifikátu." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera." #: templates/settings.php:76 msgid "Cache Time-To-Live" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 06c4333a9dd..fa6ea1ad860 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s je delil »%s« z vami" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -477,7 +481,7 @@ msgstr "Osebno" msgid "Users" msgstr "Uporabniki" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Programi" @@ -610,10 +614,6 @@ msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev." msgid "Log out" msgstr "Odjava" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Samodejno prijavljanje je zavrnjeno!" @@ -628,19 +628,19 @@ msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je raču msgid "Please change your password to secure your account again." msgstr "Spremenite geslo za izboljšanje zaščite računa." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ali ste pozabili geslo?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "zapomni si" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Prijava" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Druge prijavne možnosti" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index bf44c66320a..1428fd2d734 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Pisanje na disk je spodletelo" msgid "Not enough storage available" msgstr "Na voljo ni dovolj prostora" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Neveljavna mapa." @@ -95,20 +99,20 @@ msgstr "Na voljo ni dovolj prostora." msgid "Upload cancelled." msgstr "Pošiljanje je preklicano." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Naslov URL ne sme biti prazna vrednost." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Napaka" @@ -124,35 +128,55 @@ msgstr "Izbriši dokončno" msgid "Rename" msgstr "Preimenuj" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "V čakanju ..." -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} že obstaja" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "zamenjaj" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "predlagaj ime" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "prekliči" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "preimenovano ime {new_name} z imenom {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "razveljavi" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -160,7 +184,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "poteka pošiljanje datotek" @@ -210,22 +234,6 @@ msgstr "Velikost" msgid "Modified" msgstr "Spremenjeno" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -329,22 +337,6 @@ msgstr "Poteka preučevanje datotek, počakajte ..." msgid "Current scanning" msgstr "Trenutno poteka preučevanje" -#: templates/part.list.php:74 -msgid "directory" -msgstr "direktorij" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "direktoriji" - -#: templates/part.list.php:85 -msgid "file" -msgstr "datoteka" - -#: templates/part.list.php:87 -msgid "files" -msgstr "datoteke" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..." diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 3d68349d79b..5b7abe91daa 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Personale" msgid "Users" msgstr "Përdoruesit" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "App" @@ -602,10 +606,6 @@ msgstr "" msgid "Log out" msgstr "Dalje" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Hyrja automatike u refuzua!" @@ -620,19 +620,19 @@ msgstr "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të je msgid "Please change your password to secure your account again." msgstr "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Ke humbur kodin?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "kujto" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Hyrje" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Hyrje alternative" diff --git a/l10n/sq/files.po b/l10n/sq/files.po index 2816c2a5d6c..506285caa5a 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Ruajtja në disk dështoi" msgid "Not enough storage available" msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Dosje e pavlefshme." @@ -94,20 +98,20 @@ msgstr "Nuk ka hapësirë memorizimi e mjaftueshme" msgid "Upload cancelled." msgstr "Ngarkimi u anulua." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL-i nuk mund të jetë bosh." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Veprim i gabuar" @@ -123,41 +127,57 @@ msgstr "Elimino përfundimisht" msgid "Rename" msgstr "Riemërto" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Pezulluar" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} ekziston" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "zëvëndëso" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "sugjero një emër" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "anulo" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "U zëvëndësua {new_name} me {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "anulo" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "po ngarkoj skedarët" @@ -207,18 +227,6 @@ msgstr "Dimensioni" msgid "Modified" msgstr "Modifikuar" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "Skedarët po analizohen, ju lutemi pritni." msgid "Current scanning" msgstr "Analizimi aktual" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Po përmirësoj memorjen e filesystem-it..." diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 3d063b8411d..be1b85599a1 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "Лично" msgid "Users" msgstr "Корисници" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Апликације" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "Одјава" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Аутоматска пријава је одбијена!" @@ -622,19 +622,19 @@ msgstr "Ако ускоро не промените лозинку ваш нал msgid "Please change your password to secure your account again." msgstr "Промените лозинку да бисте обезбедили налог." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Изгубили сте лозинку?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "упамти" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Пријава" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index e6d5664fac3..c5f4089097c 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "Не могу да пишем на диск" msgid "Not enough storage available" msgstr "Нема довољно простора" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "неисправна фасцикла." @@ -94,20 +98,20 @@ msgstr "Нема довољно простора" msgid "Upload cancelled." msgstr "Отпремање је прекинуто." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "Адреса не може бити празна." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Грешка" @@ -123,42 +127,60 @@ msgstr "Обриши за стално" msgid "Rename" msgstr "Преименуј" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "На чекању" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} већ постоји" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "замени" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "предложи назив" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "откажи" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "замењено {new_name} са {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "опозови" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "датотеке се отпремају" @@ -208,20 +230,6 @@ msgstr "Величина" msgid "Modified" msgstr "Измењено" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Скенирам датотеке…" msgid "Current scanning" msgstr "Тренутно скенирање" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Дограђујем кеш система датотека…" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index c8f19598939..d4e845dc023 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "Lično" msgid "Users" msgstr "Korisnici" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Programi" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "Odjava" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -622,19 +622,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Izgubili ste lozinku?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "upamti" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index 0e1c4986995..429c1a1d2f6 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,42 +127,60 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -208,20 +230,6 @@ msgstr "Veličina" msgid "Modified" msgstr "Zadnja izmena" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 563206aaec4..0147f55088e 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -26,30 +26,34 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s delade »%s« med dig" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Aktiverade underhållsläge" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Deaktiverade underhållsläge" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Uppdaterade databasen" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Uppdaterar filcache, det kan ta lång tid..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Uppdaterade filcache" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% klart ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -471,7 +475,7 @@ msgstr "Personligt" msgid "Users" msgstr "Användare" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Program" @@ -604,10 +608,6 @@ msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för a msgid "Log out" msgstr "Logga ut" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Fler appar" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Automatisk inloggning inte tillåten!" @@ -622,19 +622,19 @@ msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara ma msgid "Please change your password to secure your account again." msgstr "Ändra genast lösenord för att säkra ditt konto." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Glömt ditt lösenord?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "kom ihåg" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Logga in" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternativa inloggningar" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index b9cbd6f04ab..00cbd7f1a36 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -78,7 +78,11 @@ msgstr "Misslyckades spara till disk" msgid "Not enough storage available" msgstr "Inte tillräckligt med lagringsutrymme tillgängligt" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Felaktig mapp." @@ -98,20 +102,20 @@ msgstr "Inte tillräckligt med utrymme tillgängligt" msgid "Upload cancelled." msgstr "Uppladdning avbruten." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL kan inte vara tom." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Fel" @@ -127,41 +131,57 @@ msgstr "Radera permanent" msgid "Rename" msgstr "Byt namn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Väntar" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} finns redan" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ersätt" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "föreslå namn" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "ersatt {new_name} med {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "ångra" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n mapp" +msgstr[1] "%n mappar" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n fil" +msgstr[1] "%n filer" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laddar upp %n fil" msgstr[1] "Laddar upp %n filer" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "filer laddas upp" @@ -211,18 +231,6 @@ msgstr "Storlek" msgid "Modified" msgstr "Ändrad" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n mapp" -msgstr[1] "%n mappar" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n fil" -msgstr[1] "%n filer" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -326,22 +334,6 @@ msgstr "Filer skannas, var god vänta" msgid "Current scanning" msgstr "Aktuell skanning" -#: templates/part.list.php:74 -msgid "directory" -msgstr "mapp" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "mappar" - -#: templates/part.list.php:85 -msgid "file" -msgstr "fil" - -#: templates/part.list.php:87 -msgid "files" -msgstr "filer" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Uppgraderar filsystemets cache..." diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po index 3230a1c404b..68d9e076132 100644 --- a/l10n/sv/lib.po +++ b/l10n/sv/lib.po @@ -4,14 +4,15 @@ # # Translators: # medialabs, 2013 +# Magnus Höglund , 2013 # medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"PO-Revision-Date: 2013-08-28 12:10+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" @@ -24,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Inget appnamn angivet" #: app.php:361 msgid "Help" @@ -88,59 +89,59 @@ msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratö #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Ingen källa angiven vid installation av app " #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Ingen href angiven vid installation av app från http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Ingen sökväg angiven vid installation av app från lokal fil" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Arkiv av typen %s stöds ej" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Kunde inte öppna arkivet när appen skulle installeras" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Appen har ingen info.xml fil" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Appen kan inte installeras eftersom att den innehåller otillåten kod" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Appen kan inte installeras eftersom att den innehåller etiketten true vilket inte är tillåtet för icke inkluderade appar" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Appens mapp finns redan" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index f29bad549d3..fe62bebfde0 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-28 11:40+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" @@ -158,7 +158,7 @@ msgstr "Filter logga in användare" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -168,7 +168,7 @@ msgstr "Filter lista användare" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -178,7 +178,7 @@ msgstr "Gruppfilter" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -239,7 +239,7 @@ msgstr "Stäng av verifiering av SSL-certifikat." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server." #: templates/settings.php:76 msgid "Cache Time-To-Live" diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po index d2936e463c6..1dec294805d 100644 --- a/l10n/sw_KE/core.po +++ b/l10n/sw_KE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po index aa0606fc49f..f32f2a01fde 100644 --- a/l10n/sw_KE/files.po +++ b/l10n/sw_KE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 2e5eebcca88..71c2bdbf22d 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "தனிப்பட்ட" msgid "Users" msgstr "பயனாளர்" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "செயலிகள்" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "விடுபதிகை செய்க" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!" @@ -618,19 +618,19 @@ msgstr "உங்களுடைய கடவுச்சொல்லை அண msgid "Please change your password to secure your account again." msgstr "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "ஞாபகப்படுத்துக" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "புகுபதிகை" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index 79dfa233f95..9bc657e7df4 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "வட்டில் எழுத முடியவில்லை" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL வெறுமையாக இருக்கமுடியாது." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "வழு" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "பெயர்மாற்றம்" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "நிலுவையிலுள்ள" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} ஏற்கனவே உள்ளது" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "மாற்றிடுக" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "பெயரை பரிந்துரைக்க" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "இரத்து செய்க" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "முன் செயல் நீக்கம் " -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "அளவு" msgid "Modified" msgstr "மாற்றப்பட்டது" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "கோப்புகள் வருடப்படுகின்ற msgid "Current scanning" msgstr "தற்போது வருடப்படுபவை" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/te/core.po b/l10n/te/core.po index 0c79b701dcd..2101fe896a7 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Users" msgstr "వాడుకరులు" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "నిష్క్రమించు" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "మీ సంకేతపదం పోయిందా?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/te/files.po b/l10n/te/files.po index bfc6052c32b..f414cfe474d 100644 --- a/l10n/te/files.po +++ b/l10n/te/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "పొరపాటు" @@ -123,41 +127,57 @@ msgstr "శాశ్వతంగా తొలగించు" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "రద్దుచేయి" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "పరిమాణం" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 8da1fb6f5b5..f9ccbd0049d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -468,7 +472,7 @@ msgstr "" msgid "Users" msgstr "" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "" @@ -601,10 +605,6 @@ msgstr "" msgid "Log out" msgstr "" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -619,19 +619,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 5b561431a04..be393c44928 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,7 +75,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -95,20 +99,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "" @@ -124,41 +128,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -208,18 +228,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -323,22 +331,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 07e3a942a01..06a88da5450 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\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 5153def3a12..79b7984dd18 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\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 3fa6985763a..4cfc080a083 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index b4195884272..ed36dd2e0d3 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,43 +28,43 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index ac1e6d8ffd2..5576a3f45bc 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\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 a5eed85152c..16f93542555 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:33-0400\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 2a61530b56e..33409afcebb 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 2aba7bb3e3b..32ba6b4a95d 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\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 d9988286212..04f405c7392 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\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/core.po b/l10n/th_TH/core.po index e963a34429c..d1e093aba89 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "ส่วนตัว" msgid "Users" msgstr "ผู้ใช้งาน" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "แอปฯ" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "ออกจากระบบ" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว" @@ -614,19 +614,19 @@ msgstr "หากคุณยังไม่ได้เปลี่ยนรห msgid "Please change your password to secure your account again." msgstr "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "ลืมรหัสผ่าน?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "จำรหัสผ่าน" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "เข้าสู่ระบบ" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index b690a1127d5..800c07574fa 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้ msgid "Not enough storage available" msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "ไดเร็กทอรี่ไม่ถูกต้อง" @@ -94,20 +98,20 @@ msgstr "มีพื้นที่เหลือไม่เพียงพอ msgid "Upload cancelled." msgstr "การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL ไม่สามารถเว้นว่างได้" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "ข้อผิดพลาด" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "เปลี่ยนชื่อ" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "อยู่ระหว่างดำเนินการ" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} มีอยู่แล้วในระบบ" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "แทนที่" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "แนะนำชื่อ" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ยกเลิก" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "เลิกทำ" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "การอัพโหลดไฟล์" @@ -206,16 +224,6 @@ msgstr "ขนาด" msgid "Modified" msgstr "แก้ไขแล้ว" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "ไฟล์กำลังอยู่ระหว่างการส msgid "Current scanning" msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "ไฟล์" - -#: templates/part.list.php:87 -msgid "files" -msgstr "ไฟล์" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..." diff --git a/l10n/tr/core.po b/l10n/tr/core.po index f23d51c91ee..ad793be7d81 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s sizinle »%s« paylaşımında bulundu" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -469,7 +473,7 @@ msgstr "Kişisel" msgid "Users" msgstr "Kullanıcılar" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Uygulamalar" @@ -602,10 +606,6 @@ msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın." msgid "Log out" msgstr "Çıkış yap" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "Daha fazla Uygulama" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Otomatik oturum açma reddedildi!" @@ -620,19 +620,19 @@ msgstr "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske gire msgid "Please change your password to secure your account again." msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Parolanızı mı unuttunuz?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "hatırla" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Giriş yap" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Alternatif Girişler" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index 5f272c31eb8..ec4947bf1e3 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "Diske yazılamadı" msgid "Not enough storage available" msgstr "Yeterli disk alanı yok" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Geçersiz dizin." @@ -97,20 +101,20 @@ msgstr "Yeterli disk alanı yok" msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/file-upload.js:167 +#: js/file-upload.js:165 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/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL boş olamaz." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir." -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Hata" @@ -126,41 +130,57 @@ msgstr "Kalıcı olarak sil" msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Bekliyor" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "değiştir" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "Öneri ad" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "iptal" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ismi {old_name} ile değiştirildi" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "geri al" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n dizin" +msgstr[1] "%n dizin" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n dosya" +msgstr[1] "%n dosya" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n dosya yükleniyor" msgstr[1] "%n dosya yükleniyor" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "Dosyalar yükleniyor" @@ -210,18 +230,6 @@ msgstr "Boyut" msgid "Modified" msgstr "Değiştirilme" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n dizin" -msgstr[1] "%n dizin" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n dosya" -msgstr[1] "%n dosya" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -325,22 +333,6 @@ msgstr "Dosyalar taranıyor, lütfen bekleyin." msgid "Current scanning" msgstr "Güncel tarama" -#: templates/part.list.php:74 -msgid "directory" -msgstr "dizin" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "dizinler" - -#: templates/part.list.php:85 -msgid "file" -msgstr "dosya" - -#: templates/part.list.php:87 -msgid "files" -msgstr "dosyalar" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Sistem dosyası önbelleği güncelleniyor" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index ab7f2d68946..e4e9c2bb89e 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 17:30+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "شەخسىي" msgid "Users" msgstr "ئىشلەتكۈچىلەر" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "ئەپلەر" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "تىزىمدىن چىق" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -614,19 +614,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ug/files.po b/l10n/ug/files.po index bedb7ab4dab..2872d4e43e4 100644 --- a/l10n/ug/files.po +++ b/l10n/ug/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "دىسكىغا يازالمىدى" msgid "Not enough storage available" msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "يېتەرلىك بوشلۇق يوق" msgid "Upload cancelled." msgstr "يۈكلەشتىن ۋاز كەچتى." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "خاتالىق" @@ -123,40 +127,54 @@ msgstr "مەڭگۈلۈك ئۆچۈر" msgid "Rename" msgstr "ئات ئۆزگەرت" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "كۈتۈۋاتىدۇ" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} مەۋجۇت" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "ئالماشتۇر" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "تەۋسىيە ئات" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "ۋاز كەچ" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "يېنىۋال" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "ھۆججەت يۈكلىنىۋاتىدۇ" @@ -206,16 +224,6 @@ msgstr "چوڭلۇقى" msgid "Modified" msgstr "ئۆزگەرتكەن" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index effc4b28936..5626dcfa66f 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -471,7 +475,7 @@ msgstr "Особисте" msgid "Users" msgstr "Користувачі" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Додатки" @@ -604,10 +608,6 @@ msgstr "" msgid "Log out" msgstr "Вихід" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Автоматичний вхід в систему відхилений!" @@ -622,19 +622,19 @@ msgstr "Якщо Ви не міняли пароль останнім часом msgid "Please change your password to secure your account again." msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Забули пароль?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "запам'ятати" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Вхід" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Альтернативні Логіни" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 7510ca1284d..b862958c94f 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Невдалося записати на диск" msgid "Not enough storage available" msgstr "Місця більше немає" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Невірний каталог." @@ -95,20 +99,20 @@ msgstr "Місця більше немає" msgid "Upload cancelled." msgstr "Завантаження перервано." -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL не може бути пустим." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Помилка" @@ -124,42 +128,60 @@ msgstr "Видалити назавжди" msgid "Rename" msgstr "Перейменувати" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Очікування" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} вже існує" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "заміна" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "запропонуйте назву" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "відміна" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "замінено {new_name} на {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "відмінити" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "файли завантажуються" @@ -209,20 +231,6 @@ msgstr "Розмір" msgid "Modified" msgstr "Змінено" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -326,22 +334,6 @@ msgstr "Файли скануються, зачекайте, будь-ласка msgid "Current scanning" msgstr "Поточне сканування" -#: templates/part.list.php:74 -msgid "directory" -msgstr "каталог" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "каталоги" - -#: templates/part.list.php:85 -msgid "file" -msgstr "файл" - -#: templates/part.list.php:87 -msgid "files" -msgstr "файли" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Оновлення кеша файлової системи..." diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 3db491e4092..4e063c00681 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -467,7 +471,7 @@ msgstr "ذاتی" msgid "Users" msgstr "یوزرز" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "ایپز" @@ -600,10 +604,6 @@ msgstr "" msgid "Log out" msgstr "لاگ آؤٹ" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "" @@ -618,19 +618,19 @@ msgstr "" msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "یاد رکھیں" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "لاگ ان" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po index d3669262ad1..e92fc72d7f3 100644 --- a/l10n/ur_PK/files.po +++ b/l10n/ur_PK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "ایرر" @@ -123,41 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -207,18 +227,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index 4f501bb51f6..d7196f3ab9f 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -23,6 +23,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -464,7 +468,7 @@ msgstr "Cá nhân" msgid "Users" msgstr "Người dùng" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "Ứng dụng" @@ -597,10 +601,6 @@ msgstr "%s còn trống. Xem thêm thông tin cách cập nhật." msgid "Log out" msgstr "Đăng xuất" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "Tự động đăng nhập đã bị từ chối !" @@ -615,19 +615,19 @@ msgstr "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tà msgid "Please change your password to secure your account again." msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa." -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "Bạn quên mật khẩu ?" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "ghi nhớ" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "Đăng nhập" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "Đăng nhập khác" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index 5f7330c3bc4..3d1f24debd6 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "Không thể ghi " msgid "Not enough storage available" msgstr "Không đủ không gian lưu trữ" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "Thư mục không hợp lệ" @@ -95,20 +99,20 @@ msgstr "Không đủ chỗ trống cần thiết" msgid "Upload cancelled." msgstr "Hủy tải lên" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này." -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL không được để trống." -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "Lỗi" @@ -124,40 +128,54 @@ msgstr "Xóa vĩnh vễn" msgid "Rename" msgstr "Sửa tên" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "Đang chờ" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} đã tồn tại" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "thay thế" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "tên gợi ý" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "hủy" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "đã thay thế {new_name} bằng {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "lùi lại" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "tệp tin đang được tải lên" @@ -207,16 +225,6 @@ msgstr "Kích cỡ" msgid "Modified" msgstr "Thay đổi" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -320,22 +328,6 @@ msgstr "Tập tin đang được quét ,vui lòng chờ." msgid "Current scanning" msgstr "Hiện tại đang quét" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "file" - -#: templates/part.list.php:87 -msgid "files" -msgstr "files" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..." diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 35152650e54..d05019be94c 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" -"Last-Translator: Xuetian Weng \n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -25,6 +25,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s 向您分享了 »%s«" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "启用维护模式" @@ -466,7 +470,7 @@ msgstr "个人" msgid "Users" msgstr "用户" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "应用" @@ -599,10 +603,6 @@ msgstr "%s 可用。获取更多关于如何升级的信息。" msgid "Log out" msgstr "注销" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "更多应用" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "自动登录被拒绝！" @@ -617,19 +617,19 @@ msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影 msgid "Please change your password to secure your account again." msgstr "请修改您的密码，以保护您的账户安全。" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "忘记密码？" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "记住" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "登录" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "其他登录方式" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index d35b319b1c6..fe65471744c 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -77,7 +77,11 @@ msgstr "写入磁盘失败" msgid "Not enough storage available" msgstr "没有足够的存储空间" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "无效文件夹。" @@ -97,20 +101,20 @@ msgstr "没有足够可用空间" msgid "Upload cancelled." msgstr "上传已取消" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL不能为空" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "错误" @@ -126,40 +130,54 @@ msgstr "永久删除" msgid "Rename" msgstr "重命名" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "等待" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} 已存在" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "替换" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "建议名称" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "取消" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "已将 {old_name}替换成 {new_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "撤销" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n 文件夹" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n个文件" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "文件上传中" @@ -209,16 +227,6 @@ msgstr "大小" msgid "Modified" msgstr "修改日期" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n 文件夹" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n个文件" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -322,22 +330,6 @@ msgstr "文件正在被扫描，请稍候。" msgid "Current scanning" msgstr "当前扫描" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "文件" - -#: templates/part.list.php:87 -msgid "files" -msgstr "文件" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "正在更新文件系统缓存..." diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index b5d97e73049..13d575a3d0c 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -22,6 +22,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -463,7 +467,7 @@ msgstr "個人" msgid "Users" msgstr "用戶" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "軟件" @@ -596,10 +600,6 @@ msgstr "" msgid "Log out" msgstr "登出" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "自動登入被拒" @@ -614,19 +614,19 @@ msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!" msgid "Please change your password to secure your account again." msgstr "請更改你的密碼以保護你的帳戶" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "忘記密碼" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "記住" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "登入" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "" diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index dc0fe5ad6fb..32b94a8ffc9 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -74,7 +74,11 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "" @@ -94,20 +98,20 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "錯誤" @@ -123,40 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "" @@ -206,16 +224,6 @@ msgstr "" msgid "Modified" msgstr "" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -319,22 +327,6 @@ msgstr "" msgid "Current scanning" msgstr "" -#: templates/part.list.php:74 -msgid "directory" -msgstr "" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "" - -#: templates/part.list.php:85 -msgid "file" -msgstr "" - -#: templates/part.list.php:87 -msgid "files" -msgstr "" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 435e7b2b7f3..52d6f701174 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 22:31+0000\n" +"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"PO-Revision-Date: 2013-08-30 13:33+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" @@ -24,6 +24,10 @@ msgstr "" msgid "%s shared »%s« with you" msgstr "%s 與您分享了 %s" +#: ajax/share.php:227 +msgid "group" +msgstr "" + #: ajax/update.php:11 msgid "Turned on maintenance mode" msgstr "" @@ -465,7 +469,7 @@ msgstr "個人" msgid "Users" msgstr "使用者" -#: strings.php:7 +#: strings.php:7 templates/layout.user.php:105 msgid "Apps" msgstr "應用程式" @@ -598,10 +602,6 @@ msgstr "%s 已經釋出，瞭解更多資訊以進行更新。" msgid "Log out" msgstr "登出" -#: templates/layout.user.php:100 -msgid "More apps" -msgstr "更多 Apps" - #: templates/login.php:9 msgid "Automatic logon rejected!" msgstr "自動登入被拒！" @@ -616,19 +616,19 @@ msgstr "如果您最近並未更改密碼，您的帳號可能已經遭到入侵 msgid "Please change your password to secure your account again." msgstr "請更改您的密碼以再次取得您帳戶的控制權。" -#: templates/login.php:34 +#: templates/login.php:32 msgid "Lost your password?" msgstr "忘記密碼？" -#: templates/login.php:39 +#: templates/login.php:37 msgid "remember" msgstr "記住" -#: templates/login.php:41 +#: templates/login.php:39 msgid "Log in" msgstr "登入" -#: templates/login.php:47 +#: templates/login.php:45 msgid "Alternative Logins" msgstr "替代登入方法" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 59f8bf91867..ffc68f12388 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 15:18+0000\n" +"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"PO-Revision-Date: 2013-08-30 13:34+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" @@ -75,7 +75,11 @@ msgstr "寫入硬碟失敗" msgid "Not enough storage available" msgstr "儲存空間不足" -#: ajax/upload.php:123 +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 msgid "Invalid directory." msgstr "無效的資料夾。" @@ -95,20 +99,20 @@ msgstr "沒有足夠的可用空間" msgid "Upload cancelled." msgstr "上傳已取消" -#: js/file-upload.js:167 +#: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "檔案上傳中。離開此頁面將會取消上傳。" -#: js/file-upload.js:241 +#: js/file-upload.js:239 msgid "URL cannot be empty." msgstr "URL 不能為空白。" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留" -#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549 +#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 msgid "Error" msgstr "錯誤" @@ -124,40 +128,54 @@ msgstr "永久刪除" msgid "Rename" msgstr "重新命名" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465 +#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 msgid "Pending" msgstr "等候中" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "{new_name} already exists" msgstr "{new_name} 已經存在" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "replace" msgstr "取代" -#: js/filelist.js:303 +#: js/filelist.js:305 msgid "suggest name" msgstr "建議檔名" -#: js/filelist.js:303 js/filelist.js:305 +#: js/filelist.js:305 js/filelist.js:307 msgid "cancel" msgstr "取消" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "replaced {new_name} with {old_name}" msgstr "使用 {new_name} 取代 {old_name}" -#: js/filelist.js:350 +#: js/filelist.js:352 msgid "undo" msgstr "復原" -#: js/filelist.js:453 +#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "%n 個資料夾" + +#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "%n 個檔案" + +#: js/filelist.js:430 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:561 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個檔案正在上傳" -#: js/filelist.js:518 +#: js/filelist.js:626 msgid "files uploading" msgstr "檔案正在上傳中" @@ -207,16 +225,6 @@ msgstr "大小" msgid "Modified" msgstr "修改" -#: js/files.js:580 -msgid "%n folder" -msgid_plural "%n folders" -msgstr[0] "%n 個資料夾" - -#: js/files.js:586 -msgid "%n file" -msgid_plural "%n files" -msgstr[0] "%n 個檔案" - #: lib/app.php:73 #, php-format msgid "%s could not be renamed" @@ -320,22 +328,6 @@ msgstr "正在掃描檔案，請稍等。" msgid "Current scanning" msgstr "目前掃描" -#: templates/part.list.php:74 -msgid "directory" -msgstr "目錄" - -#: templates/part.list.php:76 -msgid "directories" -msgstr "目錄" - -#: templates/part.list.php:85 -msgid "file" -msgstr "檔案" - -#: templates/part.list.php:87 -msgid "files" -msgstr "檔案" - #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." msgstr "正在升級檔案系統快取..." diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 1a80fc78bb6..fed9ad03c01 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -1,5 +1,7 @@ "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.", +"No app name specified" => "Nebyl zadan název aplikace", "Help" => "Nápověda", "Personal" => "Osobní", "Settings" => "Nastavení", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Zpět k souborům", "Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.", +"No source specified when installing app" => "Nebyl zadán zdroj při instalaci aplikace", +"No href specified when installing app from http" => "Nebyl zadán odkaz pro instalaci aplikace z HTTP", +"No path specified when installing app from local file" => "Nebyla zadána cesta pro instalaci aplikace z místního souboru", +"Archives of type %s are not supported" => "Archivy typu %s nejsou podporovány", +"Failed to open archive when installing app" => "Chyba při otevírání archivu během instalace aplikace", +"App does not provide an info.xml file" => "Aplikace neposkytuje soubor info.xml", +"App can't be installed because of not allowed code in the App" => "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód", +"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Aplikace nemůže být nainstalována, protože obsahuje značku\n\n\ntrue\n\n\ncož není povoleno pro nedodávané aplikace", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.", +"App directory already exists" => "Adresář aplikace již existuje", +"Can't create app folder. Please fix permissions. %s" => "Nelze vytvořit složku aplikace. Opravte práva souborů. %s", "Application is not enabled" => "Aplikace není povolena", "Authentication error" => "Chyba ověření", "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.", diff --git a/lib/l10n/da.php b/lib/l10n/da.php index 78859b08745..26903142763 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -1,5 +1,7 @@ "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud.", +"No app name specified" => "Intet app-navn angivet", "Help" => "Hjælp", "Personal" => "Personligt", "Settings" => "Indstillinger", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Tilbage til Filer", "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.", +"No source specified when installing app" => "Ingen kilde angivet under installation af app", +"No href specified when installing app from http" => "Ingen href angivet under installation af app via http", +"No path specified when installing app from local file" => "Ingen sti angivet under installation af app fra lokal fil", +"Archives of type %s are not supported" => "Arkiver af type %s understøttes ikke", +"Failed to open archive when installing app" => "Kunne ikke åbne arkiv under installation af appen", +"App does not provide an info.xml file" => "Der følger ingen info.xml-fil med appen", +"App can't be installed because of not allowed code in the App" => "Appen kan ikke installeres, da den indeholder ikke-tilladt kode", +"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Appen kan ikke installeres, da den indeholder taget\n\n\ntrue\n\n\nhvilket ikke er tilladt for ikke-medfølgende apps", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen", +"App directory already exists" => "App-mappe findes allerede", +"Can't create app folder. Please fix permissions. %s" => "Kan ikke oprette app-mappe. Ret tilladelser. %s", "Application is not enabled" => "Programmet er ikke aktiveret", "Authentication error" => "Adgangsfejl", "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 8670e1175c6..7a3e2c43e6b 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -1,7 +1,7 @@ "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.", -"No app name specified" => "Es wurde kein App-Name angegeben", +"No app name specified" => "Es wurde kein Applikation-Name angegeben", "Help" => "Hilfe", "Personal" => "Persönlich", "Settings" => "Einstellungen", @@ -16,12 +16,15 @@ $TRANSLATIONS = array( "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.", "No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben", -"No href specified when installing app from http" => "href wurde nicht angegeben um die Applikation per http zu installieren", +"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren", "No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben", "Archives of type %s are not supported" => "Archive vom Typ %s werden nicht unterstützt", -"Failed to open archive when installing app" => "Das Archive konnte bei der Installation der Applikation nicht geöffnet werden", +"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei", "App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden", +"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das true Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist", "App directory already exists" => "Das Applikationsverzeichnis existiert bereits", "Can't create app folder. Please fix permissions. %s" => "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die Berechtigungen an. %s", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index eafd76b7ee9..0a72f443e4d 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -1,5 +1,7 @@ "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.", +"No app name specified" => "Es wurde kein Applikation-Name angegeben", "Help" => "Hilfe", "Personal" => "Persönlich", "Settings" => "Einstellungen", @@ -13,8 +15,16 @@ $TRANSLATIONS = array( "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.", +"No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben", +"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren", +"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben", "Archives of type %s are not supported" => "Archive des Typs %s werden nicht unterstützt.", +"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", +"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei", +"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden", "App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das true Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist", "App directory already exists" => "Der Ordner für die Anwendung existiert bereits.", "Can't create app folder. Please fix permissions. %s" => "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php new file mode 100644 index 00000000000..f799c071c76 --- /dev/null +++ b/lib/l10n/en_GB.php @@ -0,0 +1,69 @@ + "App \"%s\" can't be installed because it is not compatible with this version of ownCloud.", +"No app name specified" => "No app name specified", +"Help" => "Help", +"Personal" => "Personal", +"Settings" => "Settings", +"Users" => "Users", +"Admin" => "Admin", +"Failed to upgrade \"%s\"." => "Failed to upgrade \"%s\".", +"web services under your control" => "web services under your control", +"cannot open \"%s\"" => "cannot open \"%s\"", +"ZIP download is turned off." => "ZIP download is turned off.", +"Files need to be downloaded one by one." => "Files need to be downloaded one by one.", +"Back to Files" => "Back to Files", +"Selected files too large to generate zip file." => "Selected files too large to generate zip file.", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download the files in smaller chunks, seperately or kindly ask your administrator.", +"No source specified when installing app" => "No source specified when installing app", +"No href specified when installing app from http" => "No href specified when installing app from http", +"No path specified when installing app from local file" => "No path specified when installing app from local file", +"Archives of type %s are not supported" => "Archives of type %s are not supported", +"Failed to open archive when installing app" => "Failed to open archive when installing app", +"App does not provide an info.xml file" => "App does not provide an info.xml file", +"App can't be installed because of not allowed code in the App" => "App can't be installed because of unallowed code in the App", +"App can't be installed because it is not compatible with this version of ownCloud" => "App can't be installed because it is not compatible with this version of ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "App can't be installed because it contains the true tag which is not allowed for non shipped apps", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store", +"App directory already exists" => "App directory already exists", +"Can't create app folder. Please fix permissions. %s" => "Can't create app folder. Please fix permissions. %s", +"Application is not enabled" => "Application is not enabled", +"Authentication error" => "Authentication error", +"Token expired. Please reload page." => "Token expired. Please reload page.", +"Files" => "Files", +"Text" => "Text", +"Images" => "Images", +"%s enter the database username." => "%s enter the database username.", +"%s enter the database name." => "%s enter the database name.", +"%s you may not use dots in the database name" => "%s you may not use dots in the database name", +"MS SQL username and/or password not valid: %s" => "MS SQL username and/or password not valid: %s", +"You need to enter either an existing account or the administrator." => "You need to enter either an existing account or the administrator.", +"MySQL username and/or password not valid" => "MySQL username and/or password not valid", +"DB Error: \"%s\"" => "DB Error: \"%s\"", +"Offending command was: \"%s\"" => "Offending command was: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "MySQL user '%s'@'localhost' exists already.", +"Drop this user from MySQL" => "Drop this user from MySQL", +"MySQL user '%s'@'%%' already exists" => "MySQL user '%s'@'%%' already exists", +"Drop this user from MySQL." => "Drop this user from MySQL.", +"Oracle connection could not be established" => "Oracle connection could not be established", +"Oracle username and/or password not valid" => "Oracle username and/or password not valid", +"Offending command was: \"%s\", name: %s, password: %s" => "Offending command was: \"%s\", name: %s, password: %s", +"PostgreSQL username and/or password not valid" => "PostgreSQL username and/or password not valid", +"Set an admin username." => "Set an admin username.", +"Set an admin password." => "Set an admin password.", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.", +"Please double check the installation guides." => "Please double check the installation guides.", +"seconds ago" => "seconds ago", +"_%n minute ago_::_%n minutes ago_" => array("","%n minutes ago"), +"_%n hour ago_::_%n hours ago_" => array("","%n hours ago"), +"today" => "today", +"yesterday" => "yesterday", +"_%n day go_::_%n days ago_" => array("","%n days ago"), +"last month" => "last month", +"_%n month ago_::_%n months ago_" => array("","%n months ago"), +"last year" => "last year", +"years ago" => "years ago", +"Caused by:" => "Caused by:", +"Could not find category \"%s\"" => "Could not find category \"%s\"" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index 4d92e89ebba..a8fee3b1bc1 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -1,5 +1,7 @@ "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud.", +"No app name specified" => "Non se especificou o nome do aplicativo", "Help" => "Axuda", "Personal" => "Persoal", "Settings" => "Axustes", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Volver aos ficheiros", "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.", +"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicativos", +"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicativos", +"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local", +"Archives of type %s are not supported" => "Os arquivos do tipo %s non están admitidos", +"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicativos", +"App does not provide an info.xml file" => "O aplicativo non fornece un ficheiro info.xml", +"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar o aplicativo por mor de conter código non permitido", +"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud.", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta\n\n\ntrue\n\nque non está permitida para os aplicativos non enviados", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store", +"App directory already exists" => "Xa existe o directorio do aplicativo", +"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s", "Application is not enabled" => "O aplicativo non está activado", "Authentication error" => "Produciuse un erro de autenticación", "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 983152a14ca..a35027eb962 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -1,5 +1,7 @@ "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.", +"No app name specified" => "Il nome dell'applicazione non è specificato", "Help" => "Aiuto", "Personal" => "Personale", "Settings" => "Impostazioni", @@ -13,6 +15,17 @@ $TRANSLATIONS = array( "Back to Files" => "Torna ai file", "Selected files too large to generate zip file." => "I file selezionati sono troppo grandi per generare un file zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.", +"No source specified when installing app" => "Nessuna fonte specificata durante l'installazione dell'applicazione", +"No href specified when installing app from http" => "Nessun href specificato durante l'installazione dell'applicazione da http", +"No path specified when installing app from local file" => "Nessun percorso specificato durante l'installazione dell'applicazione da file locale", +"Archives of type %s are not supported" => "Gli archivi di tipo %s non sono supportati", +"Failed to open archive when installing app" => "Apertura archivio non riuscita durante l'installazione dell'applicazione", +"App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml", +"App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno", +"App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store", +"App directory already exists" => "La cartella dell'applicazione esiste già", +"Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s", "Application is not enabled" => "L'applicazione non è abilitata", "Authentication error" => "Errore di autenticazione", "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.", diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php index 4101af247c2..13487b039d6 100644 --- a/lib/l10n/sk_SK.php +++ b/lib/l10n/sk_SK.php @@ -1,5 +1,7 @@ "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu.", +"No app name specified" => "Nešpecifikované meno aplikácie", "Help" => "Pomoc", "Personal" => "Osobné", "Settings" => "Nastavenia", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Späť na súbory", "Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.", +"No source specified when installing app" => "Nešpecifikovaný zdroj pri inštalácii aplikácie", +"No href specified when installing app from http" => "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"", +"No path specified when installing app from local file" => "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru", +"Archives of type %s are not supported" => "Typ archívu %s nie je podporovaný", +"Failed to open archive when installing app" => "Zlyhanie pri otváraní archívu počas inštalácie aplikácie", +"App does not provide an info.xml file" => "Aplikácia neposkytuje súbor info.xml", +"App can't be installed because of not allowed code in the App" => "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii", +"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Aplikácia nemôže byť inštalovaná pretože obsahuje pravý štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode", +"App directory already exists" => "Aplikačný adresár už existuje", +"Can't create app folder. Please fix permissions. %s" => "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s", "Application is not enabled" => "Aplikácia nie je zapnutá", "Authentication error" => "Chyba autentifikácie", "Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.", diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php index dd54e6ca5d3..e7c3420a85b 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -1,5 +1,7 @@ "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud.", +"No app name specified" => "Inget appnamn angivet", "Help" => "Hjälp", "Personal" => "Personligt", "Settings" => "Inställningar", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Tillbaka till Filer", "Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.", +"No source specified when installing app" => "Ingen källa angiven vid installation av app ", +"No href specified when installing app from http" => "Ingen href angiven vid installation av app från http", +"No path specified when installing app from local file" => "Ingen sökväg angiven vid installation av app från lokal fil", +"Archives of type %s are not supported" => "Arkiv av typen %s stöds ej", +"Failed to open archive when installing app" => "Kunde inte öppna arkivet när appen skulle installeras", +"App does not provide an info.xml file" => "Appen har ingen info.xml fil", +"App can't be installed because of not allowed code in the App" => "Appen kan inte installeras eftersom att den innehåller otillåten kod", +"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Appen kan inte installeras eftersom att den innehåller etiketten true vilket inte är tillåtet för icke inkluderade appar", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store", +"App directory already exists" => "Appens mapp finns redan", +"Can't create app folder. Please fix permissions. %s" => "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s", "Application is not enabled" => "Applikationen är inte aktiverad", "Authentication error" => "Fel vid autentisering", "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.", diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index a6288e471fd..09caacbb5ae 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -20,12 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Zakázat", "Enable" => "Povolit", "Please wait...." => "Čekejte prosím...", +"Error while disabling app" => "Chyba při zakazování aplikace", +"Error while enabling app" => "Chyba při povolování aplikace", "Updating...." => "Aktualizuji...", "Error while updating app" => "Chyba při aktualizaci aplikace", "Error" => "Chyba", "Update" => "Aktualizovat", "Updated" => "Aktualizováno", -"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.", +"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.", "Saving..." => "Ukládám...", "deleted" => "smazáno", "undo" => "vrátit zpět", @@ -103,8 +105,8 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Použijte tuto adresu pro přístup k vašim souborům přes WebDAV", "Encryption" => "Šifrování", -"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory", -"Log-in password" => "Heslo", +"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory", +"Log-in password" => "Přihlašovací heslo", "Decrypt all Files" => "Odšifrovat všechny soubory", "Login Name" => "Přihlašovací jméno", "Create" => "Vytvořit", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 2c30e51017c..87e935a93c6 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Deaktivieren", "Enable" => "Aktivieren", "Please wait...." => "Bitte warten...", +"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", +"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", "Updating...." => "Aktualisierung...", "Error while updating app" => "Fehler beim Aktualisieren der App", "Error" => "Fehler", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index c14e5a3606a..6998b51042b 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -20,8 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Deaktivieren", "Enable" => "Aktivieren", "Please wait...." => "Bitte warten....", -"Error while disabling app" => "Beim deaktivieren der Applikation ist ein Fehler aufgetreten.", -"Error while enabling app" => "Beim aktivieren der Applikation ist ein Fehler aufgetreten.", +"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", +"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", "Updating...." => "Update...", "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten", "Error" => "Fehler", diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php new file mode 100644 index 00000000000..e1a00643908 --- /dev/null +++ b/settings/l10n/en_GB.php @@ -0,0 +1,124 @@ + "Unable to load list from App Store", +"Authentication error" => "Authentication error", +"Your display name has been changed." => "Your display name has been changed.", +"Unable to change display name" => "Unable to change display name", +"Group already exists" => "Group already exists", +"Unable to add group" => "Unable to add group", +"Email saved" => "Email saved", +"Invalid email" => "Invalid email", +"Unable to delete group" => "Unable to delete group", +"Unable to delete user" => "Unable to delete user", +"Language changed" => "Language changed", +"Invalid request" => "Invalid request", +"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group", +"Unable to add user to group %s" => "Unable to add user to group %s", +"Unable to remove user from group %s" => "Unable to remove user from group %s", +"Couldn't update app." => "Couldn't update app.", +"Update to {appversion}" => "Update to {appversion}", +"Disable" => "Disable", +"Enable" => "Enable", +"Please wait...." => "Please wait....", +"Error while disabling app" => "Error whilst disabling app", +"Error while enabling app" => "Error whilst enabling app", +"Updating...." => "Updating....", +"Error while updating app" => "Error whilst updating app", +"Error" => "Error", +"Update" => "Update", +"Updated" => "Updated", +"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.", +"Saving..." => "Saving...", +"deleted" => "deleted", +"undo" => "undo", +"Unable to remove user" => "Unable to remove user", +"Groups" => "Groups", +"Group Admin" => "Group Admin", +"Delete" => "Delete", +"add group" => "add group", +"A valid username must be provided" => "A valid username must be provided", +"Error creating user" => "Error creating user", +"A valid password must be provided" => "A valid password must be provided", +"__language_name__" => "__language_name__", +"Security Warning" => "Security Warning", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.", +"Setup Warning" => "Setup Warning", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.", +"Please double check the installation guides." => "Please double check the installation guides.", +"Module 'fileinfo' missing" => "Module 'fileinfo' missing", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.", +"Locale not working" => "Locale not working", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.", +"Internet connection not working" => "Internet connection not working", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.", +"Cron" => "Cron", +"Execute one task with each page loaded" => "Execute one task with each page loaded", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is registered at a webcron service to call cron.php once a minute over http.", +"Use systems cron service to call the cron.php file once a minute." => "Use systems cron service to call the cron.php file once a minute.", +"Sharing" => "Sharing", +"Enable Share API" => "Enable Share API", +"Allow apps to use the Share API" => "Allow apps to use the Share API", +"Allow links" => "Allow links", +"Allow users to share items to the public with links" => "Allow users to share items to the public with links", +"Allow public uploads" => "Allow public uploads", +"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders", +"Allow resharing" => "Allow resharing", +"Allow users to share items shared with them again" => "Allow users to share items shared with them again", +"Allow users to share with anyone" => "Allow users to share with anyone", +"Allow users to only share with users in their groups" => "Allow users to only share with users in their groups", +"Security" => "Security", +"Enforce HTTPS" => "Enforce HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.", +"Log" => "Log", +"Log level" => "Log level", +"More" => "More", +"Less" => "Less", +"Version" => "Version", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Developed by the ownCloud community, the source code is licensed under the AGPL.", +"Add your App" => "Add your App", +"More Apps" => "More Apps", +"Select an App" => "Select an App", +"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com", +"-licensed by " => "-licensed by ", +"User Documentation" => "User Documentation", +"Administrator Documentation" => "Administrator Documentation", +"Online Documentation" => "Online Documentation", +"Forum" => "Forum", +"Bugtracker" => "Bugtracker", +"Commercial Support" => "Commercial Support", +"Get the apps to sync your files" => "Get the apps to sync your files", +"Show First Run Wizard again" => "Show First Run Wizard again", +"You have used %s of the available %s" => "You have used %s of the available %s", +"Password" => "Password", +"Your password was changed" => "Your password was changed", +"Unable to change your password" => "Unable to change your password", +"Current password" => "Current password", +"New password" => "New password", +"Change password" => "Change password", +"Display Name" => "Display Name", +"Email" => "Email", +"Your email address" => "Your email address", +"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery", +"Language" => "Language", +"Help translate" => "Help translate", +"WebDAV" => "WebDAV", +"Use this address to access your Files via WebDAV" => "Use this address to access your Files via WebDAV", +"Encryption" => "Encryption", +"The encryption app is no longer enabled, decrypt all your file" => "The encryption app is no longer enabled, decrypt all your files", +"Log-in password" => "Log-in password", +"Decrypt all Files" => "Decrypt all Files", +"Login Name" => "Login Name", +"Create" => "Create", +"Admin Recovery Password" => "Admin Recovery Password", +"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change", +"Default Storage" => "Default Storage", +"Unlimited" => "Unlimited", +"Other" => "Other", +"Username" => "Username", +"Storage" => "Storage", +"change display name" => "change display name", +"set new password" => "set new password", +"Default" => "Default" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index fb51d793c69..b3e3dfec91b 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Agarde...", +"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo", +"Error while enabling app" => "Produciuse un erro ao activar o aplicativo", "Updating...." => "Actualizando...", "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo", "Error" => "Erro", diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php index 0d22ad10741..b83407fc3bc 100644 --- a/settings/l10n/sk_SK.php +++ b/settings/l10n/sk_SK.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Zakázať", "Enable" => "Zapnúť", "Please wait...." => "Čakajte prosím...", +"Error while disabling app" => "Chyba pri zablokovaní aplikácie", +"Error while enabling app" => "Chyba pri povoľovaní aplikácie", "Updating...." => "Aktualizujem...", "Error while updating app" => "chyba pri aktualizácii aplikácie", "Error" => "Chyba", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Použite túto adresu pre prístup k súborom cez WebDAV", "Encryption" => "Šifrovanie", +"The encryption app is no longer enabled, decrypt all your file" => "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory", "Log-in password" => "Prihlasovacie heslo", "Decrypt all Files" => "Dešifrovať všetky súbory", "Login Name" => "Prihlasovacie meno", -- cgit v1.2.3 From 0869f9b655ddd0b285629256521d7eafde2f5d8a Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 6 Aug 2013 16:56:50 +0200 Subject: Fix #4258, clean up \OC_Image and improve its unittest --- lib/image.php | 301 ++++++++++++++++++++++++++++------------------------ tests/lib/image.php | 33 ++++-- 2 files changed, 189 insertions(+), 145 deletions(-) (limited to 'lib') diff --git a/lib/image.php b/lib/image.php index 4bc38e20e56..fcb13a1fa14 100644 --- a/lib/image.php +++ b/lib/image.php @@ -25,24 +25,27 @@ */ class OC_Image { protected $resource = false; // tmp resource. - protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident. - protected $bit_depth = 24; - protected $filepath = null; + protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident. + protected $mimeType = "image/png"; // Default to png + protected $bitDepth = 24; + protected $filePath = null; + + private $fileInfo; /** * @brief Get mime type for an image file. * @param $filepath The path to a local image file. * @returns string The mime type if the it could be determined, otherwise an empty string. */ - static public function getMimeTypeForFile($filepath) { + static public function getMimeTypeForFile($filePath) { // exif_imagetype throws "read error!" if file is less than 12 byte - if (filesize($filepath) > 11) { - $imagetype = exif_imagetype($filepath); + if (filesize($filePath) > 11) { + $imageType = exif_imagetype($filePath); } else { - $imagetype = false; + $imageType = false; } - return $imagetype ? image_type_to_mime_type($imagetype) : ''; + return $imageType ? image_type_to_mime_type($imageType) : ''; } /** @@ -50,14 +53,19 @@ class OC_Image { * @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function. * @returns bool False on error */ - public function __construct($imageref = null) { + public function __construct($imageRef = null) { //OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG); if(!extension_loaded('gd') || !function_exists('gd_info')) { OC_Log::write('core', __METHOD__.'(): GD module not installed', OC_Log::ERROR); return false; } - if(!is_null($imageref)) { - $this->load($imageref); + + if (\OC_Util::fileInfoLoaded()) { + $this->fileInfo = new finfo(FILEINFO_MIME_TYPE); + } + + if(!is_null($imageRef)) { + $this->load($imageRef); } } @@ -74,7 +82,7 @@ class OC_Image { * @returns int */ public function mimeType() { - return $this->valid() ? image_type_to_mime_type($this->imagetype) : ''; + return $this->valid() ? $this->mimeType : ''; } /** @@ -157,30 +165,30 @@ class OC_Image { * @returns bool */ - public function save($filepath=null) { - if($filepath === null && $this->filepath === null) { + public function save($filePath=null) { + if($filePath === null && $this->filePath === null) { OC_Log::write('core', __METHOD__.'(): called with no path.', OC_Log::ERROR); return false; - } elseif($filepath === null && $this->filepath !== null) { - $filepath = $this->filepath; + } elseif($filePath === null && $this->filePath !== null) { + $filePath = $this->filePath; } - return $this->_output($filepath); + return $this->_output($filePath); } /** * @brief Outputs/saves the image. */ - private function _output($filepath=null) { - if($filepath) { - if (!file_exists(dirname($filepath))) - mkdir(dirname($filepath), 0777, true); - if(!is_writable(dirname($filepath))) { + private function _output($filePath=null) { + if($filePath) { + if (!file_exists(dirname($filePath))) + mkdir(dirname($filePath), 0777, true); + if(!is_writable(dirname($filePath))) { OC_Log::write('core', - __METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', + __METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.', OC_Log::ERROR); return false; - } elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) { - OC_Log::write('core', __METHOD__.'(): File \''.$filepath.'\' is not writable.', OC_Log::ERROR); + } elseif(is_writable(dirname($filePath)) && file_exists($filePath) && !is_writable($filePath)) { + OC_Log::write('core', __METHOD__.'(): File \''.$filePath.'\' is not writable.', OC_Log::ERROR); return false; } } @@ -188,30 +196,30 @@ class OC_Image { return false; } - $retval = false; - switch($this->imagetype) { + $retVal = false; + switch($this->imageType) { case IMAGETYPE_GIF: - $retval = imagegif($this->resource, $filepath); + $retVal = imagegif($this->resource, $filePath); break; case IMAGETYPE_JPEG: - $retval = imagejpeg($this->resource, $filepath); + $retVal = imagejpeg($this->resource, $filePath); break; case IMAGETYPE_PNG: - $retval = imagepng($this->resource, $filepath); + $retVal = imagepng($this->resource, $filePath); break; case IMAGETYPE_XBM: - $retval = imagexbm($this->resource, $filepath); + $retVal = imagexbm($this->resource, $filePath); break; case IMAGETYPE_WBMP: - $retval = imagewbmp($this->resource, $filepath); + $retVal = imagewbmp($this->resource, $filePath); break; case IMAGETYPE_BMP: - $retval = imagebmp($this->resource, $filepath, $this->bit_depth); + $retVal = imagebmp($this->resource, $filePath, $this->bitDepth); break; default: - $retval = imagepng($this->resource, $filepath); + $retVal = imagepng($this->resource, $filePath); } - return $retval; + return $retVal; } /** @@ -233,7 +241,21 @@ class OC_Image { */ function data() { ob_start(); - $res = imagepng($this->resource); + switch ($this->mimeType) { + case "image/png": + $res = imagepng($this->resource); + break; + case "image/jpeg": + $res = imagejpeg($this->resource); + break; + case "image/gif": + $res = imagegif($this->resource); + break; + default: + $res = imagepng($this->resource); + OC_Log::write('core', 'OC_Image->data. Couldn\'t guess mimetype, defaulting to png', OC_Log::INFO); + break; + } if (!$res) { OC_Log::write('core', 'OC_Image->data. Error getting image data.', OC_Log::ERROR); } @@ -261,11 +283,11 @@ class OC_Image { OC_Log::write('core', 'OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG); return -1; } - if(is_null($this->filepath) || !is_readable($this->filepath)) { + if(is_null($this->filePath) || !is_readable($this->filePath)) { OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); return -1; } - $exif = @exif_read_data($this->filepath, 'IFD0'); + $exif = @exif_read_data($this->filePath, 'IFD0'); if(!$exif) { return -1; } @@ -351,19 +373,19 @@ class OC_Image { * @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle ). * @returns An image resource or false on error */ - public function load($imageref) { - if(is_resource($imageref)) { - if(get_resource_type($imageref) == 'gd') { - $this->resource = $imageref; + public function load($imageRef) { + if(is_resource($imageRef)) { + if(get_resource_type($imageRef) == 'gd') { + $this->resource = $imageRef; return $this->resource; - } elseif(in_array(get_resource_type($imageref), array('file', 'stream'))) { - return $this->loadFromFileHandle($imageref); + } elseif(in_array(get_resource_type($imageRef), array('file', 'stream'))) { + return $this->loadFromFileHandle($imageRef); } - } elseif($this->loadFromFile($imageref) !== false) { + } elseif($this->loadFromFile($imageRef) !== false) { return $this->resource; - } elseif($this->loadFromBase64($imageref) !== false) { + } elseif($this->loadFromBase64($imageRef) !== false) { return $this->resource; - } elseif($this->loadFromData($imageref) !== false) { + } elseif($this->loadFromData($imageRef) !== false) { return $this->resource; } else { OC_Log::write('core', __METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG); @@ -390,62 +412,62 @@ class OC_Image { * @param $imageref The path to a local file. * @returns An image resource or false on error */ - public function loadFromFile($imagepath=false) { + public function loadFromFile($imagePath=false) { // exif_imagetype throws "read error!" if file is less than 12 byte - if(!@is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) { + if(!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) { // Debug output disabled because this method is tried before loadFromBase64? - OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagePath, OC_Log::DEBUG); return false; } - $itype = exif_imagetype($imagepath); - switch($itype) { + $iType = exif_imagetype($imagePath); + switch ($iType) { case IMAGETYPE_GIF: if (imagetypes() & IMG_GIF) { - $this->resource = imagecreatefromgif($imagepath); + $this->resource = imagecreatefromgif($imagePath); } else { OC_Log::write('core', - 'OC_Image->loadFromFile, GIF images not supported: '.$imagepath, + 'OC_Image->loadFromFile, GIF images not supported: '.$imagePath, OC_Log::DEBUG); } break; case IMAGETYPE_JPEG: if (imagetypes() & IMG_JPG) { - $this->resource = imagecreatefromjpeg($imagepath); + $this->resource = imagecreatefromjpeg($imagePath); } else { OC_Log::write('core', - 'OC_Image->loadFromFile, JPG images not supported: '.$imagepath, + 'OC_Image->loadFromFile, JPG images not supported: '.$imagePath, OC_Log::DEBUG); } break; case IMAGETYPE_PNG: if (imagetypes() & IMG_PNG) { - $this->resource = imagecreatefrompng($imagepath); + $this->resource = imagecreatefrompng($imagePath); } else { OC_Log::write('core', - 'OC_Image->loadFromFile, PNG images not supported: '.$imagepath, + 'OC_Image->loadFromFile, PNG images not supported: '.$imagePath, OC_Log::DEBUG); } break; case IMAGETYPE_XBM: if (imagetypes() & IMG_XPM) { - $this->resource = imagecreatefromxbm($imagepath); + $this->resource = imagecreatefromxbm($imagePath); } else { OC_Log::write('core', - 'OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagepath, + 'OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath, OC_Log::DEBUG); } break; case IMAGETYPE_WBMP: if (imagetypes() & IMG_WBMP) { - $this->resource = imagecreatefromwbmp($imagepath); + $this->resource = imagecreatefromwbmp($imagePath); } else { OC_Log::write('core', - 'OC_Image->loadFromFile, WBMP images not supported: '.$imagepath, + 'OC_Image->loadFromFile, WBMP images not supported: '.$imagePath, OC_Log::DEBUG); } break; case IMAGETYPE_BMP: - $this->resource = $this->imagecreatefrombmp($imagepath); + $this->resource = $this->imagecreatefrombmp($imagePath); break; /* case IMAGETYPE_TIFF_II: // (intel byte order) @@ -474,14 +496,15 @@ class OC_Image { default: // this is mostly file created from encrypted file - $this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagepath))); - $itype = IMAGETYPE_PNG; + $this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath))); + $iType = IMAGETYPE_PNG; OC_Log::write('core', 'OC_Image->loadFromFile, Default', OC_Log::DEBUG); break; } if($this->valid()) { - $this->imagetype = $itype; - $this->filepath = $imagepath; + $this->imageType = $iType; + $this->mimeType = image_type_to_mime_type($iType); + $this->filePath = $imagePath; } return $this->resource; } @@ -496,6 +519,9 @@ class OC_Image { return false; } $this->resource = @imagecreatefromstring($str); + if (\OC_Util::fileInfoLoaded()) { + $this->mimeType = $this->fileInfo->buffer($str); + } if(!$this->resource) { OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG); return false; @@ -515,6 +541,9 @@ class OC_Image { $data = base64_decode($str); if($data) { // try to load from string data $this->resource = @imagecreatefromstring($data); + if (\OC_Util::fileInfoLoaded()) { + $this->mimeType = $this->fileInfo->buffer($data); + } if(!$this->resource) { OC_Log::write('core', 'OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG); return false; @@ -534,16 +563,16 @@ class OC_Image { *

    * @return resource an image resource identifier on success, FALSE on errors. */ - private function imagecreatefrombmp($filename) { - if (!($fh = fopen($filename, 'rb'))) { - trigger_error('imagecreatefrombmp: Can not open ' . $filename, E_USER_WARNING); + private function imagecreatefrombmp($fileName) { + if (!($fh = fopen($fileName, 'rb'))) { + trigger_error('imagecreatefrombmp: Can not open ' . $fileName, E_USER_WARNING); return false; } // read file header $meta = unpack('vtype/Vfilesize/Vreserved/Voffset', fread($fh, 14)); // check for bitmap if ($meta['type'] != 19778) { - trigger_error('imagecreatefrombmp: ' . $filename . ' is not a bitmap!', E_USER_WARNING); + trigger_error('imagecreatefrombmp: ' . $fileName . ' is not a bitmap!', E_USER_WARNING); return false; } // read image header @@ -554,7 +583,7 @@ class OC_Image { } // set bytes and padding $meta['bytes'] = $meta['bits'] / 8; - $this->bit_depth = $meta['bits']; //remember the bit depth for the imagebmp call + $this->bitDepth = $meta['bits']; //remember the bit depth for the imagebmp call $meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4)- floor($meta['width'] * $meta['bytes'] / 4))); if ($meta['decal'] == 4) { $meta['decal'] = 0; @@ -590,7 +619,7 @@ class OC_Image { $p = 0; $vide = chr(0); $y = $meta['height'] - 1; - $error = 'imagecreatefrombmp: ' . $filename . ' has not enough data!'; + $error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!'; // loop through the image data beginning with the lower left corner while ($y >= 0) { $x = 0; @@ -653,7 +682,7 @@ class OC_Image { break; default: trigger_error('imagecreatefrombmp: ' - . $filename . ' has ' . $meta['bits'] . ' bits and this is not supported!', + . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', E_USER_WARNING); return false; } @@ -673,24 +702,24 @@ class OC_Image { * @param $maxsize The maximum size of either the width or height. * @returns bool */ - public function resize($maxsize) { + public function resize($maxSize) { if(!$this->valid()) { OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR); return false; } - $width_orig=imageSX($this->resource); - $height_orig=imageSY($this->resource); - $ratio_orig = $width_orig/$height_orig; + $widthOrig=imageSX($this->resource); + $heightOrig=imageSY($this->resource); + $ratioOrig = $widthOrig/$heightOrig; - if ($ratio_orig > 1) { - $new_height = round($maxsize/$ratio_orig); - $new_width = $maxsize; + if ($ratioOrig > 1) { + $newHeight = round($maxSize/$ratioOrig); + $newWidth = $maxSize; } else { - $new_width = round($maxsize*$ratio_orig); - $new_height = $maxsize; + $newWidth = round($maxSize*$ratioOrig); + $newHeight = $maxSize; } - $this->preciseResize(round($new_width), round($new_height)); + $this->preciseResize(round($newWidth), round($newHeight)); return true; } @@ -699,8 +728,8 @@ class OC_Image { OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR); return false; } - $width_orig=imageSX($this->resource); - $height_orig=imageSY($this->resource); + $widthOrig=imageSX($this->resource); + $heightOrig=imageSY($this->resource); $process = imagecreatetruecolor($width, $height); if ($process == false) { @@ -710,13 +739,13 @@ class OC_Image { } // preserve transparency - if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) { + if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) { imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127)); imagealphablending($process, false); imagesavealpha($process, true); } - imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig); + imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig); if ($process == false) { OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR); imagedestroy($process); @@ -737,19 +766,19 @@ class OC_Image { OC_Log::write('core', 'OC_Image->centerCrop, No image loaded', OC_Log::ERROR); return false; } - $width_orig=imageSX($this->resource); - $height_orig=imageSY($this->resource); - if($width_orig === $height_orig and $size==0) { + $widthOrig=imageSX($this->resource); + $heightOrig=imageSY($this->resource); + if($widthOrig === $heightOrig and $size==0) { return true; } - $ratio_orig = $width_orig/$height_orig; - $width = $height = min($width_orig, $height_orig); + $ratioOrig = $widthOrig/$heightOrig; + $width = $height = min($widthOrig, $heightOrig); - if ($ratio_orig > 1) { - $x = ($width_orig/2) - ($width/2); + if ($ratioOrig > 1) { + $x = ($widthOrig/2) - ($width/2); $y = 0; } else { - $y = ($height_orig/2) - ($height/2); + $y = ($heightOrig/2) - ($height/2); $x = 0; } if($size>0) { @@ -767,7 +796,7 @@ class OC_Image { } // preserve transparency - if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) { + if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) { imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127)); imagealphablending($process, false); imagesavealpha($process, true); @@ -827,9 +856,9 @@ class OC_Image { OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR); return false; } - $width_orig=imageSX($this->resource); - $height_orig=imageSY($this->resource); - $ratio = $width_orig/$height_orig; + $widthOrig=imageSX($this->resource); + $heightOrig=imageSY($this->resource); + $ratio = $widthOrig/$heightOrig; $newWidth = min($maxWidth, $ratio*$maxHeight); $newHeight = min($maxHeight, $maxWidth/$ratio); @@ -863,7 +892,7 @@ if ( ! function_exists( 'imagebmp') ) { * @param int $compression [optional] * @return bool TRUE on success or FALSE on failure. */ - function imagebmp($im, $filename='', $bit=24, $compression=0) { + function imagebmp($im, $fileName='', $bit=24, $compression=0) { if (!in_array($bit, array(1, 4, 8, 16, 24, 32))) { $bit = 24; } @@ -874,14 +903,14 @@ if ( ! function_exists( 'imagebmp') ) { imagetruecolortopalette($im, true, $bits); $width = imagesx($im); $height = imagesy($im); - $colors_num = imagecolorstotal($im); - $rgb_quad = ''; + $colorsNum = imagecolorstotal($im); + $rgbQuad = ''; if ($bit <= 8) { - for ($i = 0; $i < $colors_num; $i++) { + for ($i = 0; $i < $colorsNum; $i++) { $colors = imagecolorsforindex($im, $i); - $rgb_quad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0"; + $rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0"; } - $bmp_data = ''; + $bmpData = ''; if ($compression == 0 || $bit < 8) { $compression = 0; $extra = ''; @@ -899,35 +928,35 @@ if ( ! function_exists( 'imagebmp') ) { $bin |= $index << $k; $i++; } - $bmp_data .= chr($bin); + $bmpData .= chr($bin); } - $bmp_data .= $extra; + $bmpData .= $extra; } } // RLE8 else if ($compression == 1 && $bit == 8) { for ($j = $height - 1; $j >= 0; $j--) { - $last_index = "\0"; - $same_num = 0; + $lastIndex = "\0"; + $sameNum = 0; for ($i = 0; $i <= $width; $i++) { $index = imagecolorat($im, $i, $j); - if ($index !== $last_index || $same_num > 255) { - if ($same_num != 0) { - $bmp_data .= chr($same_num) . chr($last_index); + if ($index !== $lastIndex || $sameNum > 255) { + if ($sameNum != 0) { + $bmpData .= chr($same_num) . chr($lastIndex); } - $last_index = $index; - $same_num = 1; + $lastIndex = $index; + $sameNum = 1; } else { - $same_num++; + $sameNum++; } } - $bmp_data .= "\0\0"; + $bmpData .= "\0\0"; } - $bmp_data .= "\0\1"; + $bmpData .= "\0\1"; } - $size_quad = strlen($rgb_quad); - $size_data = strlen($bmp_data); + $sizeQuad = strlen($rgbQuad); + $sizeData = strlen($bmpData); } else { $extra = ''; @@ -935,7 +964,7 @@ if ( ! function_exists( 'imagebmp') ) { if ($padding % 4 != 0) { $extra = str_repeat("\0", $padding); } - $bmp_data = ''; + $bmpData = ''; for ($j = $height - 1; $j >= 0; $j--) { for ($i = 0; $i < $width; $i++) { $index = imagecolorat($im, $i, $j); @@ -945,27 +974,27 @@ if ( ! function_exists( 'imagebmp') ) { $bin |= ($colors['red'] >> 3) << 10; $bin |= ($colors['green'] >> 3) << 5; $bin |= $colors['blue'] >> 3; - $bmp_data .= pack("v", $bin); + $bmpData .= pack("v", $bin); } else { - $bmp_data .= pack("c*", $colors['blue'], $colors['green'], $colors['red']); + $bmpData .= pack("c*", $colors['blue'], $colors['green'], $colors['red']); } } - $bmp_data .= $extra; + $bmpData .= $extra; } - $size_quad = 0; - $size_data = strlen($bmp_data); - $colors_num = 0; - } - $file_header = 'BM' . pack('V3', 54 + $size_quad + $size_data, 0, 54 + $size_quad); - $info_header = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $size_data, 0, 0, $colors_num, 0); - if ($filename != '') { - $fp = fopen($filename, 'wb'); - fwrite($fp, $file_header . $info_header . $rgb_quad . $bmp_data); + $sizeQuad = 0; + $sizeData = strlen($bmpData); + $colorsNum = 0; + } + $fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad); + $infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0); + if ($fileName != '') { + $fp = fopen($fileName, 'wb'); + fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData); fclose($fp); return true; } - echo $file_header . $info_header. $rgb_quad . $bmp_data; + echo $fileHeader . $infoHeader. $rgbQuad . $bmpData; return true; } } @@ -977,8 +1006,8 @@ if ( ! function_exists( 'exif_imagetype' ) ) { * @param string $filename * @return string|boolean */ - function exif_imagetype ( $filename ) { - if ( ( $info = getimagesize( $filename ) ) !== false ) { + function exif_imagetype ( $fileName ) { + if ( ( $info = getimagesize( $fileName ) ) !== false ) { return $info[2]; } return false; diff --git a/tests/lib/image.php b/tests/lib/image.php index 0583c300075..b3db89cf5b8 100644 --- a/tests/lib/image.php +++ b/tests/lib/image.php @@ -7,6 +7,10 @@ */ class Test_Image extends PHPUnit_Framework_TestCase { + public static function tearDownAfterClass() { + unlink(OC::$SERVERROOT.'/tests/data/testimage2.png'); + unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg'); + } public function testGetMimeTypeForFile() { $mimetype = \OC_Image::getMimeTypeForFile(OC::$SERVERROOT.'/tests/data/testimage.png'); @@ -55,7 +59,6 @@ class Test_Image extends PHPUnit_Framework_TestCase { } public function testMimeType() { - $this->markTestSkipped("When loading from data or base64, imagetype is always image/png, see #4258."); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png'); $this->assertEquals('image/png', $img->mimeType()); @@ -102,35 +105,47 @@ class Test_Image extends PHPUnit_Framework_TestCase { $img->resize(16); $img->save(OC::$SERVERROOT.'/tests/data/testimage2.png'); $this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.png'), $img->data()); + + $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.jpg'); + $img->resize(128); + $img->save(OC::$SERVERROOT.'/tests/data/testimage2.jpg'); + $this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.jpg'), $img->data()); } public function testData() { - $this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258."); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png'); - $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'); + $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png')); + ob_start(); + imagepng($raw); + $expected = ob_get_clean(); $this->assertEquals($expected, $img->data()); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.jpg'); - $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'); + $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg')); + ob_start(); + imagejpeg($raw); + $expected = ob_get_clean(); $this->assertEquals($expected, $img->data()); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif'); - $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'); + $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')); + ob_start(); + imagegif($raw); + $expected = ob_get_clean(); $this->assertEquals($expected, $img->data()); } public function testToString() { - $this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258."); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png'); - $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png')); + $expected = base64_encode($img->data()); $this->assertEquals($expected, (string)$img); $img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg')); - $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg')); + $expected = base64_encode($img->data()); $this->assertEquals($expected, (string)$img); $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif'); - $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')); + $expected = base64_encode($img->data()); $this->assertEquals($expected, (string)$img); } -- cgit v1.2.3 From ec9b7d1e845527957aaaf6b235227b4e5c3f033d Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 31 Aug 2013 01:41:24 +0200 Subject: fixing file header --- lib/public/appframework/App.php | 20 ++++++++++++++++++++ lib/public/appframework/iappcontainer.php | 20 ++++++++++++++++++++ lib/public/core/icontainer.php | 20 ++++++++++++++++++++ lib/public/core/irequest.php | 23 ++++++++++++++++++----- lib/public/core/iservercontainer.php | 20 ++++++++++++++++++++ 5 files changed, 98 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/public/appframework/App.php b/lib/public/appframework/App.php index 0c27fcb2ac5..d97c5c81848 100644 --- a/lib/public/appframework/App.php +++ b/lib/public/appframework/App.php @@ -1,4 +1,24 @@ . + * + */ namespace OCP\AppFramework; diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index c2faea07b95..db909241e5d 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -1,4 +1,24 @@ . + * + */ namespace OCP\AppFramework; diff --git a/lib/public/core/icontainer.php b/lib/public/core/icontainer.php index a6c93abec67..8c4a63424bf 100644 --- a/lib/public/core/icontainer.php +++ b/lib/public/core/icontainer.php @@ -1,4 +1,24 @@ . + * + */ namespace OCP\Core; diff --git a/lib/public/core/irequest.php b/lib/public/core/irequest.php index fc2004d1835..6103215842b 100644 --- a/lib/public/core/irequest.php +++ b/lib/public/core/irequest.php @@ -1,10 +1,23 @@ . + * */ namespace OCP\Core; diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php index 464da19864d..e169990a3f8 100644 --- a/lib/public/core/iservercontainer.php +++ b/lib/public/core/iservercontainer.php @@ -1,4 +1,24 @@ . + * + */ namespace OCP\Core; -- cgit v1.2.3 From 58e036e304b47dbed8dafc7ebe60f987a8a62551 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 31 Aug 2013 18:00:53 +0200 Subject: remove knowledgebase calls that are no longer used in ownCloud 5/6 --- lib/ocsclient.php | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'lib') diff --git a/lib/ocsclient.php b/lib/ocsclient.php index bd0302a2a81..58636f806be 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -40,16 +40,6 @@ class OC_OCSClient{ return($url); } - /** - * @brief Get the url of the OCS KB server. - * @returns string of the KB server - * This function returns the url of the OCS knowledge base server. It´s - * possible to set it in the config file or it will fallback to the default - */ - private static function getKBURL() { - $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1'); - return($url); - } /** * @brief Get the content of an OCS url call. @@ -214,44 +204,5 @@ class OC_OCSClient{ } - /** - * @brief Get all the knowledgebase entries from the OCS server - * @returns array with q and a data - * - * This function returns a list of all the knowledgebase entries from the OCS server - */ - public static function getKnownledgebaseEntries($page, $pagesize, $search='') { - $kbe = array('totalitems' => 0); - if(OC_Config::getValue('knowledgebaseenabled', true)) { - $p = (int) $page; - $s = (int) $pagesize; - $searchcmd = ''; - if ($search) { - $searchcmd = '&search='.urlencode($search); - } - $url = OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='. $p .'&pagesize='. $s . $searchcmd; - $xml = OC_OCSClient::getOCSresponse($url); - $data = @simplexml_load_string($xml); - if($data===false) { - OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL); - return null; - } - $tmp = $data->data->content; - for($i = 0; $i < count($tmp); $i++) { - $kbe[] = array( - 'id' => $tmp[$i]->id, - 'name' => $tmp[$i]->name, - 'description' => $tmp[$i]->description, - 'answer' => $tmp[$i]->answer, - 'preview1' => $tmp[$i]->smallpreviewpic1, - 'detailpage' => $tmp[$i]->detailpage - ); - } - $kbe['totalitems'] = $data->meta->totalitems; - } - return $kbe; - } - - } -- cgit v1.2.3 From f1836a997f9c8051bf040b78cd5475a8e9862fe0 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 31 Aug 2013 18:14:46 +0200 Subject: remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future. --- lib/ocs/activity.php | 28 ---------------------------- ocs/routes.php | 8 -------- 2 files changed, 36 deletions(-) delete mode 100644 lib/ocs/activity.php (limited to 'lib') diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php deleted file mode 100644 index c30e21018d3..00000000000 --- a/lib/ocs/activity.php +++ /dev/null @@ -1,28 +0,0 @@ -. -* -*/ - -class OC_OCS_Activity { - - public static function activityGet($parameters){ - // TODO - } -} diff --git a/ocs/routes.php b/ocs/routes.php index 283c9af6924..c4a74d77900 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -21,14 +21,6 @@ OC_API::register( 'core', OC_API::GUEST_AUTH ); -// Activity -OC_API::register( - 'get', - '/activity', - array('OC_OCS_Activity', 'activityGet'), - 'core', - OC_API::USER_AUTH - ); // Privatedata OC_API::register( 'get', -- cgit v1.2.3 From 97bdf008b1cefaa092e23fc5a9bad787e755ed77 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 31 Aug 2013 20:57:16 +0200 Subject: PHPDoc added to existing interfaces --- lib/public/core/icontainer.php | 25 +++++++++++++++++++++++++ lib/public/core/irequest.php | 8 ++++++-- lib/public/core/iservercontainer.php | 13 +++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/core/icontainer.php b/lib/public/core/icontainer.php index 8c4a63424bf..88ebc6cf64d 100644 --- a/lib/public/core/icontainer.php +++ b/lib/public/core/icontainer.php @@ -31,9 +31,34 @@ namespace OCP\Core; */ interface IContainer { + /** + * Look up a service for a given name in the container. + * + * @param string $name + * @return mixed + */ function query($name); + /** + * A value is stored in the container with it's corresponding name + * + * @param string $name + * @param mixed $value + * @return void + */ function registerParameter($name, $value); + /** + * A service is registered in the container where a closure is passed in which will actually + * create the service on demand. + * In case the parameter $shared is set to true (the default usage) the once created service will remain in + * memory and be reused on subsequent calls. + * In case the parameter is false the service will be recreated on every call. + * + * @param string $name + * @param callable $closure + * @param bool $shared + * @return void + */ function registerService($name, \Closure $closure, $shared = true); } diff --git a/lib/public/core/irequest.php b/lib/public/core/irequest.php index 6103215842b..be60978a3c3 100644 --- a/lib/public/core/irequest.php +++ b/lib/public/core/irequest.php @@ -45,6 +45,7 @@ interface IRequest { /** * Returns all params that were received, be it from the request + * * (as GET or POST) or through the URL by the route * @return array the array with all parameters */ @@ -52,12 +53,14 @@ interface IRequest { /** * Returns the method of the request + * * @return string the method of the request (POST, GET, etc) */ public function getMethod(); /** * Shortcut for accessing an uploaded file through the $_FILES array + * * @param string $key the key that will be taken from the $_FILES array * @return array the file in the $_FILES element */ @@ -66,6 +69,7 @@ interface IRequest { /** * Shortcut for getting env variables + * * @param string $key the key that will be taken from the $_ENV array * @return array the value in the $_ENV element */ @@ -74,6 +78,7 @@ interface IRequest { /** * Shortcut for getting session variables + * * @param string $key the key that will be taken from the $_SESSION array * @return array the value in the $_SESSION element */ @@ -82,6 +87,7 @@ interface IRequest { /** * Shortcut for getting cookie variables + * * @param string $key the key that will be taken from the $_COOKIE array * @return array the value in the $_COOKIE element */ @@ -92,9 +98,7 @@ interface IRequest { * Returns the request body content. * * @param Boolean $asResource If true, a resource will be returned - * * @return string|resource The request body content or a resource to read the body stream. - * * @throws \LogicException */ function getContent($asResource = false); diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php index e169990a3f8..0517cc53e09 100644 --- a/lib/public/core/iservercontainer.php +++ b/lib/public/core/iservercontainer.php @@ -32,7 +32,20 @@ namespace OCP\Core; interface IServerContainer { /** + * The contacts manager will act as a broker between consumers for contacts information and + * providers which actual deliver the contact information. + * * @return \OCP\Core\Contacts\IManager */ function getContactsManager(); + + /** + * The current request object holding all information about the request currently being processed + * is returned from this method. + * In case the current execution was not initiated by a web request null is returned + * + * @return \OCP\Core\IRequest|null + */ + function getRequest(); + } -- cgit v1.2.3 From 206f83941b26b16f89e695ae84b998e9cf11132a Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 31 Aug 2013 21:34:29 +0200 Subject: move new interfaces into lib/public and OCP --- .../dependencyinjection/dicontainer.php | 2 +- lib/appframework/http/request.php | 2 +- lib/appframework/utility/simplecontainer.php | 2 +- lib/contactsmanager.php | 2 +- lib/public/appframework/iappcontainer.php | 4 +- lib/public/contacts/imanager.php | 150 +++++++++++++++++++++ lib/public/core/contacts/imanager.php | 150 --------------------- lib/public/core/icontainer.php | 64 --------- lib/public/core/irequest.php | 105 --------------- lib/public/core/iservercontainer.php | 51 ------- lib/public/icontainer.php | 64 +++++++++ lib/public/irequest.php | 105 +++++++++++++++ lib/public/iservercontainer.php | 51 +++++++ lib/server.php | 16 ++- 14 files changed, 390 insertions(+), 378 deletions(-) create mode 100644 lib/public/contacts/imanager.php delete mode 100644 lib/public/core/contacts/imanager.php delete mode 100644 lib/public/core/icontainer.php delete mode 100644 lib/public/core/irequest.php delete mode 100644 lib/public/core/iservercontainer.php create mode 100644 lib/public/icontainer.php create mode 100644 lib/public/irequest.php create mode 100644 lib/public/iservercontainer.php (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 43f6eee29b0..2ef885d7b2c 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -132,7 +132,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } /** - * @return \OCP\Core\IServerContainer + * @return \OCP\IServerContainer */ function getServer() { diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php index ab72a8db697..4f1775182a1 100644 --- a/lib/appframework/http/request.php +++ b/lib/appframework/http/request.php @@ -22,7 +22,7 @@ namespace OC\AppFramework\Http; -use OCP\Core\IRequest; +use OCP\IRequest; /** * Class for accessing variables in the request. diff --git a/lib/appframework/utility/simplecontainer.php b/lib/appframework/utility/simplecontainer.php index 04b6cd727b8..a51ace83a37 100644 --- a/lib/appframework/utility/simplecontainer.php +++ b/lib/appframework/utility/simplecontainer.php @@ -10,7 +10,7 @@ require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php'; * * SimpleContainer is a simple implementation of IContainer on basis of \Pimple */ -class SimpleContainer extends \Pimple implements \OCP\Core\IContainer { +class SimpleContainer extends \Pimple implements \OCP\IContainer { /** * @param string $name name of the service to query for diff --git a/lib/contactsmanager.php b/lib/contactsmanager.php index 59c413ec03b..fc6745b4505 100644 --- a/lib/contactsmanager.php +++ b/lib/contactsmanager.php @@ -22,7 +22,7 @@ namespace OC { - class ContactsManager implements \OCP\Core\Contacts\IManager { + class ContactsManager implements \OCP\Contacts\IManager { /** * This function is used to search and find contacts within the users address books. diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index db909241e5d..c8f6229dd9e 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -23,7 +23,7 @@ namespace OCP\AppFramework; use OCP\AppFramework\IApi; -use OCP\Core\IContainer; +use OCP\IContainer; /** * Class IAppContainer @@ -39,7 +39,7 @@ interface IAppContainer extends IContainer{ function getCoreApi(); /** - * @return \OCP\Core\IServerContainer + * @return \OCP\IServerContainer */ function getServer(); } diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php new file mode 100644 index 00000000000..3bfbca7be50 --- /dev/null +++ b/lib/public/contacts/imanager.php @@ -0,0 +1,150 @@ +. + * + */ + +/** + * Public interface of ownCloud for apps to use. + * Contacts Class + * + */ + +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP\Contacts { + + /** + * This class provides access to the contacts app. Use this class exclusively if you want to access contacts. + * + * Contacts in general will be expressed as an array of key-value-pairs. + * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1 + * + * Proposed workflow for working with contacts: + * - search for the contacts + * - manipulate the results array + * - createOrUpdate will save the given contacts overwriting the existing data + * + * For updating it is mandatory to keep the id. + * Without an id a new contact will be created. + * + */ + interface IManager { + + /** + * This function is used to search and find contacts within the users address books. + * In case $pattern is empty all contacts will be returned. + * + * Example: + * Following function shows how to search for contacts for the name and the email address. + * + * public static function getMatchingRecipient($term) { + * $cm = \OC::$server->getContactsManager(); + * // The API is not active -> nothing to do + * if (!$cm->isEnabled()) { + * return array(); + * } + * + * $result = $cm->search($term, array('FN', 'EMAIL')); + * $receivers = array(); + * foreach ($result as $r) { + * $id = $r['id']; + * $fn = $r['FN']; + * $email = $r['EMAIL']; + * if (!is_array($email)) { + * $email = array($email); + * } + * + * // loop through all email addresses of this contact + * foreach ($email as $e) { + * $displayName = $fn . " <$e>"; + * $receivers[] = array( + * 'id' => $id, + * 'label' => $displayName, + * 'value' => $displayName); + * } + * } + * + * return $receivers; + * } + * + * + * @param string $pattern which should match within the $searchProperties + * @param array $searchProperties defines the properties within the query pattern should match + * @param array $options - for future use. One should always have options! + * @return array of contacts which are arrays of key-value-pairs + */ + function search($pattern, $searchProperties = array(), $options = array()); + + /** + * This function can be used to delete the contact identified by the given id + * + * @param object $id the unique identifier to a contact + * @param $address_book_key + * @return bool successful or not + */ + function delete($id, $address_book_key); + + /** + * This function is used to create a new contact if 'id' is not given or not present. + * Otherwise the contact will be updated by replacing the entire data set. + * + * @param array $properties this array if key-value-pairs defines a contact + * @param $address_book_key string to identify the address book in which the contact shall be created or updated + * @return array representing the contact just created or updated + */ + function createOrUpdate($properties, $address_book_key); + + /** + * Check if contacts are available (e.g. contacts app enabled) + * + * @return bool true if enabled, false if not + */ + function isEnabled(); + + /** + * @param \OCP\IAddressBook $address_book + */ + function registerAddressBook(\OCP\IAddressBook $address_book); + + /** + * @param \OCP\IAddressBook $address_book + */ + function unregisterAddressBook(\OCP\IAddressBook $address_book); + + /** + * In order to improve lazy loading a closure can be registered which will be called in case + * address books are actually requested + * + * @param string $key + * @param \Closure $callable + */ + function register($key, \Closure $callable); + + /** + * @return array + */ + function getAddressBooks(); + + /** + * removes all registered address book instances + */ + function clear(); + } +} diff --git a/lib/public/core/contacts/imanager.php b/lib/public/core/contacts/imanager.php deleted file mode 100644 index e8bb7bfd8e4..00000000000 --- a/lib/public/core/contacts/imanager.php +++ /dev/null @@ -1,150 +0,0 @@ -. - * - */ - -/** - * Public interface of ownCloud for apps to use. - * Contacts Class - * - */ - -// use OCP namespace for all classes that are considered public. -// This means that they should be used by apps instead of the internal ownCloud classes -namespace OCP\Core\Contacts { - - /** - * This class provides access to the contacts app. Use this class exclusively if you want to access contacts. - * - * Contacts in general will be expressed as an array of key-value-pairs. - * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1 - * - * Proposed workflow for working with contacts: - * - search for the contacts - * - manipulate the results array - * - createOrUpdate will save the given contacts overwriting the existing data - * - * For updating it is mandatory to keep the id. - * Without an id a new contact will be created. - * - */ - interface IManager { - - /** - * This function is used to search and find contacts within the users address books. - * In case $pattern is empty all contacts will be returned. - * - * Example: - * Following function shows how to search for contacts for the name and the email address. - * - * public static function getMatchingRecipient($term) { - * $cm = \OC::$server->getContactsManager(); - * // The API is not active -> nothing to do - * if (!$cm->isEnabled()) { - * return array(); - * } - * - * $result = $cm->search($term, array('FN', 'EMAIL')); - * $receivers = array(); - * foreach ($result as $r) { - * $id = $r['id']; - * $fn = $r['FN']; - * $email = $r['EMAIL']; - * if (!is_array($email)) { - * $email = array($email); - * } - * - * // loop through all email addresses of this contact - * foreach ($email as $e) { - * $displayName = $fn . " <$e>"; - * $receivers[] = array( - * 'id' => $id, - * 'label' => $displayName, - * 'value' => $displayName); - * } - * } - * - * return $receivers; - * } - * - * - * @param string $pattern which should match within the $searchProperties - * @param array $searchProperties defines the properties within the query pattern should match - * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs - */ - function search($pattern, $searchProperties = array(), $options = array()); - - /** - * This function can be used to delete the contact identified by the given id - * - * @param object $id the unique identifier to a contact - * @param $address_book_key - * @return bool successful or not - */ - function delete($id, $address_book_key); - - /** - * This function is used to create a new contact if 'id' is not given or not present. - * Otherwise the contact will be updated by replacing the entire data set. - * - * @param array $properties this array if key-value-pairs defines a contact - * @param $address_book_key string to identify the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated - */ - function createOrUpdate($properties, $address_book_key); - - /** - * Check if contacts are available (e.g. contacts app enabled) - * - * @return bool true if enabled, false if not - */ - function isEnabled(); - - /** - * @param \OCP\IAddressBook $address_book - */ - function registerAddressBook(\OCP\IAddressBook $address_book); - - /** - * @param \OCP\IAddressBook $address_book - */ - function unregisterAddressBook(\OCP\IAddressBook $address_book); - - /** - * In order to improve lazy loading a closure can be registered which will be called in case - * address books are actually requested - * - * @param string $key - * @param \Closure $callable - */ - function register($key, \Closure $callable); - - /** - * @return array - */ - function getAddressBooks(); - - /** - * removes all registered address book instances - */ - function clear(); - } -} diff --git a/lib/public/core/icontainer.php b/lib/public/core/icontainer.php deleted file mode 100644 index 88ebc6cf64d..00000000000 --- a/lib/public/core/icontainer.php +++ /dev/null @@ -1,64 +0,0 @@ -. - * - */ - -namespace OCP\Core; - -/** - * Class IContainer - * - * IContainer is the basic interface to be used for any internal dependency injection mechanism - * - * @package OCP\Core - */ -interface IContainer { - - /** - * Look up a service for a given name in the container. - * - * @param string $name - * @return mixed - */ - function query($name); - - /** - * A value is stored in the container with it's corresponding name - * - * @param string $name - * @param mixed $value - * @return void - */ - function registerParameter($name, $value); - - /** - * A service is registered in the container where a closure is passed in which will actually - * create the service on demand. - * In case the parameter $shared is set to true (the default usage) the once created service will remain in - * memory and be reused on subsequent calls. - * In case the parameter is false the service will be recreated on every call. - * - * @param string $name - * @param callable $closure - * @param bool $shared - * @return void - */ - function registerService($name, \Closure $closure, $shared = true); -} diff --git a/lib/public/core/irequest.php b/lib/public/core/irequest.php deleted file mode 100644 index be60978a3c3..00000000000 --- a/lib/public/core/irequest.php +++ /dev/null @@ -1,105 +0,0 @@ -. - * - */ - -namespace OCP\Core; - - -interface IRequest { - - function getHeader($name); - - /** - * Lets you access post and get parameters by the index - * In case of json requests the encoded json body is accessed - * - * @param string $key the key which you want to access in the URL Parameter - * placeholder, $_POST or $_GET array. - * The priority how they're returned is the following: - * 1. URL parameters - * 2. POST parameters - * 3. GET parameters - * @param mixed $default If the key is not found, this value will be returned - * @return mixed the content of the array - */ - public function getParam($key, $default = null); - - - /** - * Returns all params that were received, be it from the request - * - * (as GET or POST) or through the URL by the route - * @return array the array with all parameters - */ - public function getParams(); - - /** - * Returns the method of the request - * - * @return string the method of the request (POST, GET, etc) - */ - public function getMethod(); - - /** - * Shortcut for accessing an uploaded file through the $_FILES array - * - * @param string $key the key that will be taken from the $_FILES array - * @return array the file in the $_FILES element - */ - public function getUploadedFile($key); - - - /** - * Shortcut for getting env variables - * - * @param string $key the key that will be taken from the $_ENV array - * @return array the value in the $_ENV element - */ - public function getEnv($key); - - - /** - * Shortcut for getting session variables - * - * @param string $key the key that will be taken from the $_SESSION array - * @return array the value in the $_SESSION element - */ - function getSession($key); - - - /** - * Shortcut for getting cookie variables - * - * @param string $key the key that will be taken from the $_COOKIE array - * @return array the value in the $_COOKIE element - */ - function getCookie($key); - - - /** - * Returns the request body content. - * - * @param Boolean $asResource If true, a resource will be returned - * @return string|resource The request body content or a resource to read the body stream. - * @throws \LogicException - */ - function getContent($asResource = false); -} diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php deleted file mode 100644 index 0517cc53e09..00000000000 --- a/lib/public/core/iservercontainer.php +++ /dev/null @@ -1,51 +0,0 @@ -. - * - */ - -namespace OCP\Core; - - -/** - * Class IServerContainer - * @package OCP\Core - * - * This container holds all ownCloud services - */ -interface IServerContainer { - - /** - * The contacts manager will act as a broker between consumers for contacts information and - * providers which actual deliver the contact information. - * - * @return \OCP\Core\Contacts\IManager - */ - function getContactsManager(); - - /** - * The current request object holding all information about the request currently being processed - * is returned from this method. - * In case the current execution was not initiated by a web request null is returned - * - * @return \OCP\Core\IRequest|null - */ - function getRequest(); - -} diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php new file mode 100644 index 00000000000..d43c1c90f11 --- /dev/null +++ b/lib/public/icontainer.php @@ -0,0 +1,64 @@ +. + * + */ + +namespace OCP; + +/** + * Class IContainer + * + * IContainer is the basic interface to be used for any internal dependency injection mechanism + * + * @package OCP + */ +interface IContainer { + + /** + * Look up a service for a given name in the container. + * + * @param string $name + * @return mixed + */ + function query($name); + + /** + * A value is stored in the container with it's corresponding name + * + * @param string $name + * @param mixed $value + * @return void + */ + function registerParameter($name, $value); + + /** + * A service is registered in the container where a closure is passed in which will actually + * create the service on demand. + * In case the parameter $shared is set to true (the default usage) the once created service will remain in + * memory and be reused on subsequent calls. + * In case the parameter is false the service will be recreated on every call. + * + * @param string $name + * @param callable $closure + * @param bool $shared + * @return void + */ + function registerService($name, \Closure $closure, $shared = true); +} diff --git a/lib/public/irequest.php b/lib/public/irequest.php new file mode 100644 index 00000000000..cd39855950b --- /dev/null +++ b/lib/public/irequest.php @@ -0,0 +1,105 @@ +. + * + */ + +namespace OCP; + + +interface IRequest { + + function getHeader($name); + + /** + * Lets you access post and get parameters by the index + * In case of json requests the encoded json body is accessed + * + * @param string $key the key which you want to access in the URL Parameter + * placeholder, $_POST or $_GET array. + * The priority how they're returned is the following: + * 1. URL parameters + * 2. POST parameters + * 3. GET parameters + * @param mixed $default If the key is not found, this value will be returned + * @return mixed the content of the array + */ + public function getParam($key, $default = null); + + + /** + * Returns all params that were received, be it from the request + * + * (as GET or POST) or through the URL by the route + * @return array the array with all parameters + */ + public function getParams(); + + /** + * Returns the method of the request + * + * @return string the method of the request (POST, GET, etc) + */ + public function getMethod(); + + /** + * Shortcut for accessing an uploaded file through the $_FILES array + * + * @param string $key the key that will be taken from the $_FILES array + * @return array the file in the $_FILES element + */ + public function getUploadedFile($key); + + + /** + * Shortcut for getting env variables + * + * @param string $key the key that will be taken from the $_ENV array + * @return array the value in the $_ENV element + */ + public function getEnv($key); + + + /** + * Shortcut for getting session variables + * + * @param string $key the key that will be taken from the $_SESSION array + * @return array the value in the $_SESSION element + */ + function getSession($key); + + + /** + * Shortcut for getting cookie variables + * + * @param string $key the key that will be taken from the $_COOKIE array + * @return array the value in the $_COOKIE element + */ + function getCookie($key); + + + /** + * Returns the request body content. + * + * @param Boolean $asResource If true, a resource will be returned + * @return string|resource The request body content or a resource to read the body stream. + * @throws \LogicException + */ + function getContent($asResource = false); +} diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php new file mode 100644 index 00000000000..5f5b9677549 --- /dev/null +++ b/lib/public/iservercontainer.php @@ -0,0 +1,51 @@ +. + * + */ + +namespace OCP; + + +/** + * Class IServerContainer + * @package OCP + * + * This container holds all ownCloud services + */ +interface IServerContainer { + + /** + * The contacts manager will act as a broker between consumers for contacts information and + * providers which actual deliver the contact information. + * + * @return \OCP\Contacts\IManager + */ + function getContactsManager(); + + /** + * The current request object holding all information about the request currently being processed + * is returned from this method. + * In case the current execution was not initiated by a web request null is returned + * + * @return \OCP\IRequest|null + */ + function getRequest(); + +} diff --git a/lib/server.php b/lib/server.php index 72c82efe16b..ad955bf5c65 100644 --- a/lib/server.php +++ b/lib/server.php @@ -3,7 +3,7 @@ namespace OC; use OC\AppFramework\Utility\SimpleContainer; -use OCP\Core\IServerContainer; +use OCP\IServerContainer; /** * Class Server @@ -20,9 +20,21 @@ class Server extends SimpleContainer implements IServerContainer { } /** - * @return \OCP\Core\Contacts\IManager + * @return \OCP\Contacts\IManager */ function getContactsManager() { return $this->query('ContactsManager'); } + + /** + * The current request object holding all information about the request currently being processed + * is returned from this method. + * In case the current execution was not initiated by a web request null is returned + * + * @return \OCP\IRequest|null + */ + function getRequest() + { + return $this->query('Request'); + } } -- cgit v1.2.3 From c54994d2e9ba1d6ea1e2c1037192e1d79e64c281 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 1 Sep 2013 08:23:11 +0200 Subject: fixing this obvious typo directly --- lib/public/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/preview.php b/lib/public/preview.php index e488eade4da..7588347eccb 100644 --- a/lib/public/preview.php +++ b/lib/public/preview.php @@ -22,7 +22,7 @@ class Preview { * @return image */ public static function show($file,$maxX=100,$maxY=75,$scaleup=false) { - return(\OC_Preview::show($file,$maxX,$maxY,$scaleup)); + return(\OC\Preview::show($file,$maxX,$maxY,$scaleup)); } -- cgit v1.2.3 From 2d6a400381ffe9d13047ecf7273c550f335e5225 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 1 Sep 2013 15:50:58 +0200 Subject: Check for $this->fileInfo and @depend on testData() --- lib/image.php | 4 ++-- tests/lib/image.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/image.php b/lib/image.php index badc30ab9a0..7761a3c7737 100644 --- a/lib/image.php +++ b/lib/image.php @@ -519,7 +519,7 @@ class OC_Image { return false; } $this->resource = @imagecreatefromstring($str); - if (\OC_Util::fileInfoLoaded()) { + if ($this->fileInfo) { $this->mimeType = $this->fileInfo->buffer($str); } if(is_resource($this->resource)) { @@ -546,7 +546,7 @@ class OC_Image { $data = base64_decode($str); if($data) { // try to load from string data $this->resource = @imagecreatefromstring($data); - if (\OC_Util::fileInfoLoaded()) { + if ($this->fileInfo) { $this->mimeType = $this->fileInfo->buffer($data); } if(!$this->resource) { diff --git a/tests/lib/image.php b/tests/lib/image.php index b3db89cf5b8..4aba1b0bc61 100644 --- a/tests/lib/image.php +++ b/tests/lib/image.php @@ -135,6 +135,9 @@ class Test_Image extends PHPUnit_Framework_TestCase { $this->assertEquals($expected, $img->data()); } + /** + * @depends testData + */ public function testToString() { $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png'); $expected = base64_encode($img->data()); -- cgit v1.2.3 From 0aba549e7f11e1035fa7a2e880803b47cbadd919 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sun, 1 Sep 2013 16:40:50 +0200 Subject: Use more object oriented way for console commands --- 3rdparty | 2 +- apps/files/command/scan.php | 55 +++++++++++++++++++++++++++++++++++++++++++++ apps/files/console/scan.php | 31 ------------------------- console.php | 37 +++++++----------------------- core/command/status.php | 30 +++++++++++++++++++++++++ lib/base.php | 1 + 6 files changed, 95 insertions(+), 61 deletions(-) create mode 100644 apps/files/command/scan.php delete mode 100644 apps/files/console/scan.php create mode 100644 core/command/status.php (limited to 'lib') diff --git a/3rdparty b/3rdparty index dc87ea63028..98fdc3a4e2f 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit dc87ea630287f27502eba825fbb19fcc33c34c86 +Subproject commit 98fdc3a4e2f56f7d231470418222162dbf95f46a diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php new file mode 100644 index 00000000000..fce4f6875d7 --- /dev/null +++ b/apps/files/command/scan.php @@ -0,0 +1,55 @@ +setName('files:scan') + ->setDescription('rescan filesystem') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, + 'will rescan all files of the given user(s)' + ) + ->addOption( + 'all', + null, + InputOption::VALUE_NONE, + 'will rescan all files of all known users' + ) + ; + } + + protected function scanFiles($user, OutputInterface $output) { + $scanner = new \OC\Files\Utils\Scanner($user); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) { + $output->writeln("Scanning $path"); + }); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) { + $output->writeln("Scanning $path"); + }); + $scanner->scan(''); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if ($input->getOption('all')) { + $users = \OC_User::getUsers(); + } else { + $users = $input->getArgument('user_id'); + } + + foreach ($users as $user) { + $this->scanFiles($user, $output); + } + } +} diff --git a/apps/files/console/scan.php b/apps/files/console/scan.php deleted file mode 100644 index 70183fc888a..00000000000 --- a/apps/files/console/scan.php +++ /dev/null @@ -1,31 +0,0 @@ -" . PHP_EOL; - echo " will rescan all files of the given user" . PHP_EOL; - echo " files:scan --all" . PHP_EOL; - echo " will rescan all files of all known users" . PHP_EOL; - return; -} - -function scanFiles($user) { - $scanner = new \OC\Files\Utils\Scanner($user); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) { - echo "Scanning $path" . PHP_EOL; - }); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) { - echo "Scanning $path" . PHP_EOL; - }); - $scanner->scan(''); -} - -if ($argv[1] === '--all') { - $users = OC_User::getUsers(); -} else { - $users = array($argv[1]); -} - -foreach ($users as $user) { - scanFiles($user); -} diff --git a/console.php b/console.php index fbe09d9bb68..9639f60b7ac 100644 --- a/console.php +++ b/console.php @@ -7,6 +7,9 @@ * See the COPYING-README file. */ +use OC\Core\Command\GreetCommand; +use Symfony\Component\Console\Application; + $RUNTIME_NOAPPS = true; require_once 'lib/base.php'; @@ -21,32 +24,8 @@ if (!OC::$CLI) { exit(0); } -$self = basename($argv[0]); -if ($argc <= 1) { - $argv[1] = "help"; -} - -$command = $argv[1]; -array_shift($argv); - -switch ($command) { - case 'files:scan': - require_once 'apps/files/console/scan.php'; - break; - case 'status': - require_once 'status.php'; - break; - case 'help': - echo "Usage:" . PHP_EOL; - echo " " . $self . " " . PHP_EOL; - echo PHP_EOL; - echo "Available commands:" . PHP_EOL; - echo " files:scan -> rescan filesystem" .PHP_EOL; - echo " status -> show some status information" .PHP_EOL; - echo " help -> show this help screen" .PHP_EOL; - break; - default: - echo "Unknown command '$command'" . PHP_EOL; - echo "For available commands type ". $self . " help" . PHP_EOL; - break; -} +$defaults = new OC_Defaults; +$application = new Application($defaults->getName(), \OC_Util::getVersionString()); +$application->add(new OC\Core\Command\Status); +$application->add(new OCA\Files\Command\Scan); +$application->run(); diff --git a/core/command/status.php b/core/command/status.php new file mode 100644 index 00000000000..601780257e4 --- /dev/null +++ b/core/command/status.php @@ -0,0 +1,30 @@ +setName('status') + ->setDescription('show some status information') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $values = array( + 'installed' => \OC_Config::getValue('installed') ? 'true' : 'false', + 'version' => implode('.', \OC_Util::getVersion()), + 'versionstring' => \OC_Util::getVersionString(), + 'edition' => \OC_Util::getEditionString()); + print_r($values); + } +} diff --git a/lib/base.php b/lib/base.php index b5c12a683ff..dfd7cb662fb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -358,6 +358,7 @@ class OC { self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); + self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); self::$loader->registerPrefix('Sabre\\VObject', '3rdparty'); self::$loader->registerPrefix('Sabre_', '3rdparty'); self::$loader->registerPrefix('Patchwork', '3rdparty'); -- cgit v1.2.3 From 76b1b5b6a31f8241a369f45da4de99a6dd71e2eb Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 1 Sep 2013 18:17:14 +0200 Subject: Provide 'enable_avatars' in config.php, to disable avatars --- config/config.sample.php | 3 +++ core/templates/layout.user.php | 2 ++ lib/base.php | 12 +++++++----- settings/personal.php | 6 ++++-- settings/templates/personal.php | 2 ++ settings/templates/users.php | 4 ++++ 6 files changed, 22 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 5f748438bc7..a9ce48a4e9d 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -214,4 +214,7 @@ $CONFIG = array( 'preview_libreoffice_path' => '/usr/bin/libreoffice', /* cl parameters for libreoffice / openoffice */ 'preview_office_cl_parameters' => '', + +/* whether avatars should be enabled */ +'enable_avatars' => true, ); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index c67df07bd41..3a46680c3fc 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,7 +46,9 @@ src="" alt="getName()); ?>" /> +
    +
      diff --git a/lib/base.php b/lib/base.php index 9f16edd14f5..b66e58f54b4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -266,11 +266,13 @@ class OC { OC_Util::addScript('router'); OC_Util::addScript("oc-requesttoken"); - // defaultavatars - \OC_Util::addScript('placeholder'); - \OC_Util::addScript('3rdparty', 'md5/md5.min'); - \OC_Util::addScript('jquery.avatar'); - \OC_Util::addScript('avatar'); + // avatars + if (\OC_Config::getValue('enable_avatars', true) === true) { + \OC_Util::addScript('placeholder'); + \OC_Util::addScript('3rdparty', 'md5/md5.min'); + \OC_Util::addScript('jquery.avatar'); + \OC_Util::addScript('avatar'); + } OC_Util::addStyle("styles"); OC_Util::addStyle("apps"); diff --git a/settings/personal.php b/settings/personal.php index 6a6619d5a14..88e8802663d 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -16,8 +16,10 @@ OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); \OC_Util::addScript('files', 'jquery.fileupload'); -\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min'); -\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min'); +if (\OC_Config::getValue('enable_avatars', true) === true) { + \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min'); + \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min'); +} OC_App::setActiveNavigationEntry( 'personal' ); $storageInfo=OC_Helper::getStorageInfo('/'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index c488623a088..d4a0e3b9480 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -80,6 +80,7 @@ if($_['passwordChangeSupported']) { } ?> +
      t('Profile Image')); ?> @@ -92,6 +93,7 @@ if($_['passwordChangeSupported']) {
      t('Remove image')); ?>
      +
      diff --git a/settings/templates/users.php b/settings/templates/users.php index 2fe0b83cf33..445e5ce2fd5 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -81,7 +81,9 @@ $_['subadmingroups'] = array_flip($items); + + @@ -97,7 +99,9 @@ $_['subadmingroups'] = array_flip($items); " data-displayName=""> + +
      t('Username'))?> t( 'Display Name' )); ?> t( 'Password' )); ?>
      		Date: Sun, 1 Sep 2013 13:30:40 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ar.php | 8 +++ apps/files/l10n/bg_BG.php | 1 + apps/files/l10n/ca.php | 1 + apps/files/l10n/cs_CZ.php | 2 + apps/files/l10n/cy_GB.php | 1 + apps/files/l10n/da.php | 2 + apps/files/l10n/de.php | 2 + apps/files/l10n/de_DE.php | 2 + apps/files/l10n/el.php | 1 + apps/files/l10n/eo.php | 1 + apps/files/l10n/es.php | 1 + apps/files/l10n/es_AR.php | 1 + apps/files/l10n/et_EE.php | 1 + apps/files/l10n/eu.php | 1 + apps/files/l10n/fa.php | 1 + apps/files/l10n/fi_FI.php | 2 + apps/files/l10n/fr.php | 1 + apps/files/l10n/gl.php | 1 + apps/files/l10n/he.php | 1 + apps/files/l10n/hu_HU.php | 1 + apps/files/l10n/it.php | 2 + apps/files/l10n/ja_JP.php | 2 + apps/files/l10n/ka_GE.php | 1 + apps/files/l10n/ko.php | 1 + apps/files/l10n/lt_LT.php | 1 + apps/files/l10n/lv.php | 1 + apps/files/l10n/nb_NO.php | 1 + apps/files/l10n/nl.php | 1 + apps/files/l10n/nn_NO.php | 1 + apps/files/l10n/pl.php | 1 + apps/files/l10n/pt_BR.php | 1 + apps/files/l10n/pt_PT.php | 9 ++-- apps/files/l10n/ro.php | 1 + apps/files/l10n/ru.php | 1 + apps/files/l10n/si_LK.php | 1 + apps/files/l10n/sk_SK.php | 1 + apps/files/l10n/sl.php | 1 + apps/files/l10n/sr.php | 1 + apps/files/l10n/sv.php | 2 + apps/files/l10n/ta_LK.php | 1 + apps/files/l10n/th_TH.php | 1 + apps/files/l10n/tr.php | 1 + apps/files/l10n/uk.php | 1 + apps/files/l10n/vi.php | 1 + apps/files/l10n/zh_CN.php | 1 + apps/files/l10n/zh_TW.php | 50 ++++++++--------- apps/files_sharing/l10n/zh_TW.php | 4 +- apps/files_trashbin/l10n/pt_PT.php | 4 +- apps/files_trashbin/l10n/zh_TW.php | 2 +- core/l10n/ar.php | 1 + core/l10n/ca.php | 1 + core/l10n/cs_CZ.php | 1 + core/l10n/cy_GB.php | 1 + core/l10n/da.php | 1 + core/l10n/de.php | 1 + core/l10n/de_CH.php | 1 + core/l10n/de_DE.php | 1 + core/l10n/el.php | 1 + core/l10n/eo.php | 1 + core/l10n/es.php | 1 + core/l10n/es_AR.php | 1 + core/l10n/et_EE.php | 1 + core/l10n/eu.php | 1 + core/l10n/fa.php | 1 + core/l10n/fi_FI.php | 1 + core/l10n/fr.php | 1 + core/l10n/gl.php | 1 + core/l10n/he.php | 1 + core/l10n/hu_HU.php | 1 + core/l10n/id.php | 1 + core/l10n/it.php | 1 + core/l10n/ja_JP.php | 7 +++ core/l10n/ka_GE.php | 1 + core/l10n/ko.php | 1 + core/l10n/lb.php | 1 + core/l10n/lt_LT.php | 1 + core/l10n/lv.php | 1 + core/l10n/mk.php | 1 + core/l10n/nb_NO.php | 1 + core/l10n/nl.php | 1 + core/l10n/nn_NO.php | 1 + core/l10n/oc.php | 1 + core/l10n/pl.php | 1 + core/l10n/pt_BR.php | 1 + core/l10n/pt_PT.php | 1 + core/l10n/ro.php | 1 + core/l10n/ru.php | 1 + core/l10n/si_LK.php | 1 + core/l10n/sk_SK.php | 1 + core/l10n/sl.php | 1 + core/l10n/sr.php | 1 + core/l10n/sv.php | 1 + core/l10n/ta_LK.php | 1 + core/l10n/th_TH.php | 1 + core/l10n/tr.php | 1 + core/l10n/ug.php | 1 + core/l10n/uk.php | 1 + core/l10n/vi.php | 1 + core/l10n/zh_CN.php | 1 + core/l10n/zh_TW.php | 37 +++++++------ l10n/ar/core.po | 6 +-- l10n/ar/files.po | 69 ++++++++++++------------ l10n/bg_BG/files.po | 52 +++++++++--------- l10n/ca/core.po | 6 +-- l10n/ca/files.po | 52 +++++++++--------- l10n/cs_CZ/core.po | 8 +-- l10n/cs_CZ/files.po | 56 +++++++++---------- l10n/cy_GB/core.po | 6 +-- l10n/cy_GB/files.po | 52 +++++++++--------- l10n/da/core.po | 6 +-- l10n/da/files.po | 56 +++++++++---------- l10n/de/core.po | 6 +-- l10n/de/files.po | 56 +++++++++---------- l10n/de_CH/core.po | 6 +-- l10n/de_CH/files.po | 52 +++++++++--------- l10n/de_DE/core.po | 6 +-- l10n/de_DE/files.po | 57 ++++++++++---------- l10n/el/core.po | 6 +-- l10n/el/files.po | 52 +++++++++--------- l10n/en_GB/core.po | 4 +- l10n/en_GB/files.po | 50 ++++++++--------- l10n/eo/core.po | 6 +-- l10n/eo/files.po | 52 +++++++++--------- l10n/es/core.po | 6 +-- l10n/es/files.po | 52 +++++++++--------- l10n/es/lib.po | 49 ++++++++--------- l10n/es_AR/core.po | 6 +-- l10n/es_AR/files.po | 52 +++++++++--------- l10n/et_EE/core.po | 6 +-- l10n/et_EE/files.po | 52 +++++++++--------- l10n/eu/core.po | 6 +-- l10n/eu/files.po | 52 +++++++++--------- l10n/fa/core.po | 6 +-- l10n/fa/files.po | 52 +++++++++--------- l10n/fi_FI/core.po | 6 +-- l10n/fi_FI/files.po | 56 +++++++++---------- l10n/fr/core.po | 6 +-- l10n/fr/files.po | 52 +++++++++--------- l10n/gl/core.po | 6 +-- l10n/gl/files.po | 52 +++++++++--------- l10n/he/core.po | 6 +-- l10n/he/files.po | 52 +++++++++--------- l10n/hu_HU/core.po | 6 +-- l10n/hu_HU/files.po | 52 +++++++++--------- l10n/id/core.po | 6 +-- l10n/it/core.po | 6 +-- l10n/it/files.po | 56 +++++++++---------- l10n/it/lib.po | 29 +++++----- l10n/it/settings.po | 33 ++++++------ l10n/ja_JP/core.po | 20 +++---- l10n/ja_JP/files.po | 56 +++++++++---------- l10n/ja_JP/lib.po | 52 +++++++++--------- l10n/ja_JP/settings.po | 32 +++++------ l10n/ka_GE/core.po | 6 +-- l10n/ka_GE/files.po | 52 +++++++++--------- l10n/ko/core.po | 6 +-- l10n/ko/files.po | 52 +++++++++--------- l10n/lb/core.po | 6 +-- l10n/lt_LT/core.po | 6 +-- l10n/lt_LT/files.po | 52 +++++++++--------- l10n/lv/core.po | 6 +-- l10n/lv/files.po | 52 +++++++++--------- l10n/mk/core.po | 6 +-- l10n/nb_NO/core.po | 6 +-- l10n/nb_NO/files.po | 52 +++++++++--------- l10n/nl/core.po | 6 +-- l10n/nl/files.po | 52 +++++++++--------- l10n/nn_NO/core.po | 6 +-- l10n/nn_NO/files.po | 52 +++++++++--------- l10n/oc/core.po | 6 +-- l10n/pl/core.po | 6 +-- l10n/pl/files.po | 52 +++++++++--------- l10n/pt_BR/core.po | 6 +-- l10n/pt_BR/files.po | 52 +++++++++--------- l10n/pt_PT/core.po | 6 +-- l10n/pt_PT/files.po | 71 ++++++++++++------------ l10n/pt_PT/files_trashbin.po | 32 +++++------ l10n/pt_PT/settings.po | 40 +++++++------- l10n/ro/core.po | 6 +-- l10n/ro/files.po | 52 +++++++++--------- l10n/ru/core.po | 6 +-- l10n/ru/files.po | 52 +++++++++--------- l10n/si_LK/core.po | 6 +-- l10n/si_LK/files.po | 52 +++++++++--------- l10n/sk_SK/core.po | 6 +-- l10n/sk_SK/files.po | 52 +++++++++--------- l10n/sl/core.po | 6 +-- l10n/sl/files.po | 52 +++++++++--------- l10n/sr/core.po | 6 +-- l10n/sr/files.po | 52 +++++++++--------- l10n/sv/core.po | 6 +-- l10n/sv/files.po | 56 +++++++++---------- l10n/ta_LK/core.po | 6 +-- l10n/ta_LK/files.po | 52 +++++++++--------- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 48 ++++++++--------- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 6 +-- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 22 ++++---- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/core.po | 6 +-- l10n/th_TH/files.po | 52 +++++++++--------- l10n/tr/core.po | 6 +-- l10n/tr/files.po | 52 +++++++++--------- l10n/ug/core.po | 6 +-- l10n/uk/core.po | 6 +-- l10n/uk/files.po | 52 +++++++++--------- l10n/vi/core.po | 6 +-- l10n/vi/files.po | 52 +++++++++--------- l10n/zh_CN/core.po | 6 +-- l10n/zh_CN/files.po | 52 +++++++++--------- l10n/zh_TW/core.po | 50 ++++++++--------- l10n/zh_TW/files.po | 104 ++++++++++++++++++------------------ l10n/zh_TW/files_sharing.po | 12 ++--- l10n/zh_TW/files_trashbin.po | 24 ++++----- l10n/zh_TW/settings.po | 30 +++++------ lib/l10n/es.php | 11 ++++ lib/l10n/it.php | 1 + lib/l10n/ja_JP.php | 13 +++++ settings/l10n/it.php | 2 + settings/l10n/ja_JP.php | 2 + settings/l10n/pt_PT.php | 6 +++ settings/l10n/zh_TW.php | 4 +- 228 files changed, 1919 insertions(+), 1751 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index 8346eece88b..99eb409a369 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم", "Could not move %s" => "فشل في نقل %s", +"Unable to set upload directory." => "غير قادر على تحميل المجلد", +"Invalid Token" => "علامة غير صالحة", "No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف", "There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "حجم الملف المرفوع تجاوز قيمة upload_max_filesize الموجودة في ملف php.ini ", @@ -11,12 +13,15 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "المجلد المؤقت غير موجود", "Failed to write to disk" => "خطأ في الكتابة على القرص الصلب", "Not enough storage available" => "لا يوجد مساحة تخزينية كافية", +"Upload failed" => "عملية الرفع فشلت", "Invalid directory." => "مسار غير صحيح.", "Files" => "الملفات", "Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت", +"Not enough space available" => "لا توجد مساحة كافية", "Upload cancelled." => "تم إلغاء عملية رفع الملفات .", "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "URL cannot be empty." => "عنوان ال URL لا يجوز أن يكون فارغا.", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud", "Error" => "خطأ", "Share" => "شارك", "Delete permanently" => "حذف بشكل دائم", @@ -30,12 +35,15 @@ $TRANSLATIONS = array( "undo" => "تراجع", "_%n folder_::_%n folders_" => array("","","","","",""), "_%n file_::_%n files_" => array("","","","","",""), +"{dirs} and {files}" => "{dirs} و {files}", "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""), +"files uploading" => "يتم تحميل الملفات", "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.", "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها", "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !", "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.", "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.", "Name" => "اسم", "Size" => "حجم", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index e7dafd1c43a..913875e863a 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -6,6 +6,7 @@ $TRANSLATIONS = array( "No file was uploaded" => "Фахлът не бе качен", "Missing a temporary folder" => "Липсва временна папка", "Failed to write to disk" => "Възникна проблем при запис в диска", +"Upload failed" => "Качването е неуспешно", "Invalid directory." => "Невалидна директория.", "Files" => "Файлове", "Upload cancelled." => "Качването е спряно.", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 9f90138eebe..648ffce79d6 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un fitxer temporal", "Failed to write to disk" => "Ha fallat en escriure al disc", "Not enough storage available" => "No hi ha prou espai disponible", +"Upload failed" => "La pujada ha fallat", "Invalid directory." => "Directori no vàlid.", "Files" => "Fitxers", "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index c46758c7bcc..691cc92f1ad 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", "Failed to write to disk" => "Zápis na disk selhal", "Not enough storage available" => "Nedostatek dostupného úložného prostoru", +"Upload failed" => "Odesílání selhalo", "Invalid directory." => "Neplatný adresář", "Files" => "Soubory", "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "vrátit zpět", "_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"), "_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), +"{dirs} and {files}" => "{dirs} a {files}", "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"), "files uploading" => "soubory se odesílají", "'.' is an invalid file name." => "'.' je neplatným názvem souboru.", diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index 666e90e9db8..157f4f89a23 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Plygell dros dro yn eisiau", "Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg", "Not enough storage available" => "Dim digon o le storio ar gael", +"Upload failed" => "Methwyd llwytho i fyny", "Invalid directory." => "Cyfeiriadur annilys.", "Files" => "Ffeiliau", "Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 36703322f93..aab12986ec1 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglende midlertidig mappe.", "Failed to write to disk" => "Fejl ved skrivning til disk.", "Not enough storage available" => "Der er ikke nok plads til rådlighed", +"Upload failed" => "Upload fejlede", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "fortryd", "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), "_%n file_::_%n files_" => array("%n fil","%n filer"), +"{dirs} and {files}" => "{dirs} og {files}", "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"), "files uploading" => "uploader filer", "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 8d8d30cb6e7..947d4f07461 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", +"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "rückgängig machen", "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), +"{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 309a885d37f..db07ed7fadd 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", +"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "rückgängig machen", "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), +"{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 1dca8e41f6d..8c89e5e1feb 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος", "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο", "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος", +"Upload failed" => "Η μεταφόρτωση απέτυχε", "Invalid directory." => "Μη έγκυρος φάκελος.", "Files" => "Αρχεία", "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index 2a011ab214b..ad538f2f2a9 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mankas provizora dosierujo.", "Failed to write to disk" => "Malsukcesis skribo al disko", "Not enough storage available" => "Ne haveblas sufiĉa memoro", +"Upload failed" => "Alŝuto malsukcesis", "Invalid directory." => "Nevalida dosierujo.", "Files" => "Dosieroj", "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 1ff1506aaf4..7a5785577af 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta la carpeta temporal", "Failed to write to disk" => "Falló al escribir al disco", "Not enough storage available" => "No hay suficiente espacio disponible", +"Upload failed" => "Error en la subida", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", "Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index dac4d4e4de2..1c26c10028d 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un directorio temporal", "Failed to write to disk" => "Error al escribir en el disco", "Not enough storage available" => "No hay suficiente almacenamiento", +"Upload failed" => "Error al subir el archivo", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index e1947cb8f73..5a2bb437d39 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Ajutiste failide kaust puudub", "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus", "Not enough storage available" => "Saadaval pole piisavalt ruumi", +"Upload failed" => "Üleslaadimine ebaõnnestus", "Invalid directory." => "Vigane kaust.", "Files" => "Failid", "Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 6c6e92dda38..524be56af02 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Aldi bateko karpeta falta da", "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan", "Not enough storage available" => "Ez dago behar aina leku erabilgarri,", +"Upload failed" => "igotzeak huts egin du", "Invalid directory." => "Baliogabeko karpeta.", "Files" => "Fitxategiak", "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index afa04e53ab2..24584f715b5 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "یک پوشه موقت گم شده", "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود", "Not enough storage available" => "فضای کافی در دسترس نیست", +"Upload failed" => "بارگزاری ناموفق بود", "Invalid directory." => "فهرست راهنما نامعتبر می باشد.", "Files" => "پرونده‌ها", "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index d18ff4f0207..1d29dbf79d2 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Tilapäiskansio puuttuu", "Failed to write to disk" => "Levylle kirjoitus epäonnistui", "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä", +"Upload failed" => "Lähetys epäonnistui", "Invalid directory." => "Virheellinen kansio.", "Files" => "Tiedostot", "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.", @@ -30,6 +31,7 @@ $TRANSLATIONS = array( "undo" => "kumoa", "_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), "_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), +"{dirs} and {files}" => "{dirs} ja {files}", "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"), "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.", "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 40bb81296e6..4e3b0de112a 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Absence de dossier temporaire.", "Failed to write to disk" => "Erreur d'écriture sur le disque", "Not enough storage available" => "Plus assez d'espace de stockage disponible", +"Upload failed" => "Échec de l'envoi", "Invalid directory." => "Dossier invalide.", "Files" => "Fichiers", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 2df738cb15f..6ec1816308a 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta o cartafol temporal", "Failed to write to disk" => "Produciuse un erro ao escribir no disco", "Not enough storage available" => "Non hai espazo de almacenamento abondo", +"Upload failed" => "Produciuse un fallou no envío", "Invalid directory." => "O directorio é incorrecto.", "Files" => "Ficheiros", "Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 7141c8442e2..40d7cc9c552 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "תקיה זמנית חסרה", "Failed to write to disk" => "הכתיבה לכונן נכשלה", "Not enough storage available" => "אין די שטח פנוי באחסון", +"Upload failed" => "ההעלאה נכשלה", "Invalid directory." => "תיקייה שגויה.", "Files" => "קבצים", "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 741964503ff..66edbefbca5 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", "Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Not enough storage available" => "Nincs elég szabad hely.", +"Upload failed" => "A feltöltés nem sikerült", "Invalid directory." => "Érvénytelen mappa.", "Files" => "Fájlok", "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ű", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 2d53da21604..b0ec954d907 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manca una cartella temporanea", "Failed to write to disk" => "Scrittura su disco non riuscita", "Not enough storage available" => "Spazio di archiviazione insufficiente", +"Upload failed" => "Caricamento non riuscito", "Invalid directory." => "Cartella non valida.", "Files" => "File", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "annulla", "_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), "_%n file_::_%n files_" => array("%n file","%n file"), +"{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"), "files uploading" => "caricamento file", "'.' is an invalid file name." => "'.' non è un nome file valido.", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 09675b63f51..5438cbb4976 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "一時保存フォルダが見つかりません", "Failed to write to disk" => "ディスクへの書き込みに失敗しました", "Not enough storage available" => "ストレージに十分な空き容量がありません", +"Upload failed" => "アップロードに失敗", "Invalid directory." => "無効なディレクトリです。", "Files" => "ファイル", "Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "元に戻す", "_%n folder_::_%n folders_" => array("%n個のフォルダ"), "_%n file_::_%n files_" => array("%n個のファイル"), +"{dirs} and {files}" => "{dirs} と {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"), "files uploading" => "ファイルをアップロード中", "'.' is an invalid file name." => "'.' は無効なファイル名です。", diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 8fd522aebcc..455e3211a55 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს", "Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას", "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის", +"Upload failed" => "ატვირთვა ვერ განხორციელდა", "Invalid directory." => "დაუშვებელი დირექტორია.", "Files" => "ფაილები", "Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 86666c70569..e2b787e7f91 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "임시 폴더가 없음", "Failed to write to disk" => "디스크에 쓰지 못했습니다", "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.", +"Upload failed" => "업로드 실패", "Invalid directory." => "올바르지 않은 디렉터리입니다.", "Files" => "파일", "Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 3bcc6b84439..0530adc2ae2 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nėra laikinojo katalogo", "Failed to write to disk" => "Nepavyko įrašyti į diską", "Not enough storage available" => "Nepakanka vietos serveryje", +"Upload failed" => "Nusiuntimas nepavyko", "Invalid directory." => "Neteisingas aplankas", "Files" => "Failai", "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index 52cea5305d0..d24aaca9e4c 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Trūkst pagaidu mapes", "Failed to write to disk" => "Neizdevās saglabāt diskā", "Not enough storage available" => "Nav pietiekami daudz vietas", +"Upload failed" => "Neizdevās augšupielādēt", "Invalid directory." => "Nederīga direktorija.", "Files" => "Datnes", "Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 5c7780825fb..55ce978d2a2 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mangler midlertidig mappe", "Failed to write to disk" => "Klarte ikke å skrive til disk", "Not enough storage available" => "Ikke nok lagringsplass", +"Upload failed" => "Opplasting feilet", "Invalid directory." => "Ugyldig katalog.", "Files" => "Filer", "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", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index a4386992cf6..9fb13517369 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Er ontbreekt een tijdelijke map", "Failed to write to disk" => "Schrijven naar schijf mislukt", "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar", +"Upload failed" => "Upload mislukt", "Invalid directory." => "Ongeldige directory.", "Files" => "Bestanden", "Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 84402057a3a..b1f38057a88 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglar ei mellombels mappe", "Failed to write to disk" => "Klarte ikkje skriva til disk", "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg", +"Upload failed" => "Feil ved opplasting", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", "Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index c55d81cea2f..4b22b080b28 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Brak folderu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", "Not enough storage available" => "Za mało dostępnego miejsca", +"Upload failed" => "Wysyłanie nie powiodło się", "Invalid directory." => "Zła ścieżka.", "Files" => "Pliki", "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index bfe34bab21f..15d0c170e66 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Pasta temporária não encontrada", "Failed to write to disk" => "Falha ao escrever no disco", "Not enough storage available" => "Espaço de armazenamento insuficiente", +"Upload failed" => "Falha no envio", "Invalid directory." => "Diretório inválido.", "Files" => "Arquivos", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 8cd73a9f70c..33ec8cddce6 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Está a faltar a pasta temporária", "Failed to write to disk" => "Falhou a escrita no disco", "Not enough storage available" => "Não há espaço suficiente em disco", +"Upload failed" => "Carregamento falhou", "Invalid directory." => "Directório Inválido", "Files" => "Ficheiros", "Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes", @@ -32,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}", "undo" => "desfazer", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"), +"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), +"{dirs} and {files}" => "{dirs} e {files}", +"_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"), "files uploading" => "A enviar os ficheiros", "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!", "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.", "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.", "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.", "Name" => "Nome", "Size" => "Tamanho", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 3b5359384ac..59f6cc68499 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Lipsește un director temporar", "Failed to write to disk" => "Eroare la scriere pe disc", "Not enough storage available" => "Nu este suficient spațiu disponibil", +"Upload failed" => "Încărcarea a eșuat", "Invalid directory." => "Director invalid.", "Files" => "Fișiere", "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.", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index e0bf97038d4..96f52a9045c 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Отсутствует временная папка", "Failed to write to disk" => "Ошибка записи на диск", "Not enough storage available" => "Недостаточно доступного места в хранилище", +"Upload failed" => "Ошибка загрузки", "Invalid directory." => "Неправильный каталог.", "Files" => "Файлы", "Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.", diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index 7d24370a092..1fd18d0c56f 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි", "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්", "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි", +"Upload failed" => "උඩුගත කිරීම අසාර්ථකයි", "Files" => "ගොනු", "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී", "File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index e7ade013792..b30f263d244 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chýba dočasný priečinok", "Failed to write to disk" => "Zápis na disk sa nepodaril", "Not enough storage available" => "Nedostatok dostupného úložného priestoru", +"Upload failed" => "Odoslanie bolo neúspešné", "Invalid directory." => "Neplatný priečinok.", "Files" => "Súbory", "Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 6819ed3a3b3..08f789ff866 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", "Not enough storage available" => "Na voljo ni dovolj prostora", +"Upload failed" => "Pošiljanje je spodletelo", "Invalid directory." => "Neveljavna mapa.", "Files" => "Datoteke", "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index b8cf91f4da6..73f8ace5c81 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Недостаје привремена фасцикла", "Failed to write to disk" => "Не могу да пишем на диск", "Not enough storage available" => "Нема довољно простора", +"Upload failed" => "Отпремање није успело", "Invalid directory." => "неисправна фасцикла.", "Files" => "Датотеке", "Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index 20bf77bb609..fbbe1f15910 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "En temporär mapp saknas", "Failed to write to disk" => "Misslyckades spara till disk", "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt", +"Upload failed" => "Misslyckad uppladdning", "Invalid directory." => "Felaktig mapp.", "Files" => "Filer", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes", @@ -34,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "ångra", "_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), "_%n file_::_%n files_" => array("%n fil","%n filer"), +"{dirs} and {files}" => "{dirs} och {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"), "files uploading" => "filer laddas upp", "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.", diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index fc52c16daf3..154e0d6796e 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை", "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை", +"Upload failed" => "பதிவேற்றல் தோல்வியுற்றது", "Files" => "கோப்புகள்", "Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை", "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index b65c0bc705e..aa8cf4e9b50 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย", "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว", "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน", +"Upload failed" => "อัพโหลดล้มเหลว", "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" => "ไฟล์", "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index d317b11d532..dd089757d5f 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Geçici dizin eksik", "Failed to write to disk" => "Diske yazılamadı", "Not enough storage available" => "Yeterli disk alanı yok", +"Upload failed" => "Yükleme başarısız", "Invalid directory." => "Geçersiz dizin.", "Files" => "Dosyalar", "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", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 79a18231d2c..781590cff35 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Відсутній тимчасовий каталог", "Failed to write to disk" => "Невдалося записати на диск", "Not enough storage available" => "Місця більше немає", +"Upload failed" => "Помилка завантаження", "Invalid directory." => "Невірний каталог.", "Files" => "Файли", "Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index 02b184d218c..b98a14f6d7b 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Không tìm thấy thư mục tạm", "Failed to write to disk" => "Không thể ghi ", "Not enough storage available" => "Không đủ không gian lưu trữ", +"Upload failed" => "Tải lên thất bại", "Invalid directory." => "Thư mục không hợp lệ", "Files" => "Tập tin", "Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index fa2e3403f4b..59b09ad950b 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "缺少临时目录", "Failed to write to disk" => "写入磁盘失败", "Not enough storage available" => "没有足够的存储空间", +"Upload failed" => "上传失败", "Invalid directory." => "无效文件夹。", "Files" => "文件", "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 6ba8bf35de8..21c929f81a6 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -1,11 +1,11 @@ "無法移動 %s - 同名的檔案已經存在", +"Could not move %s - File with this name already exists" => "無法移動 %s ，同名的檔案已經存在", "Could not move %s" => "無法移動 %s", -"Unable to set upload directory." => "無法設定上傳目錄。", +"Unable to set upload directory." => "無法設定上傳目錄", "Invalid Token" => "無效的 token", -"No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。", -"There is no error, the file uploaded with success" => "無錯誤，檔案上傳成功", +"No file was uploaded. Unknown error" => "沒有檔案被上傳，原因未知", +"There is no error, the file uploaded with success" => "一切都順利，檔案上傳成功", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制", "The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳", @@ -13,13 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "找不到暫存資料夾", "Failed to write to disk" => "寫入硬碟失敗", "Not enough storage available" => "儲存空間不足", -"Invalid directory." => "無效的資料夾。", +"Upload failed" => "上傳失敗", +"Invalid directory." => "無效的資料夾", "Files" => "檔案", -"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0", +"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0", "Not enough space available" => "沒有足夠的可用空間", "Upload cancelled." => "上傳已取消", -"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。", -"URL cannot be empty." => "URL 不能為空白。", +"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。", +"URL cannot be empty." => "URL 不能為空", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留", "Error" => "錯誤", "Share" => "分享", @@ -34,43 +35,44 @@ $TRANSLATIONS = array( "undo" => "復原", "_%n folder_::_%n folders_" => array("%n 個資料夾"), "_%n file_::_%n files_" => array("%n 個檔案"), +"{dirs} and {files}" => "{dirs} 和 {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"), -"files uploading" => "檔案正在上傳中", -"'.' is an invalid file name." => "'.' 是不合法的檔名。", -"File name cannot be empty." => "檔名不能為空。", -"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。", +"files uploading" => "檔案上傳中", +"'.' is an invalid file name." => "'.' 是不合法的檔名", +"File name cannot be empty." => "檔名不能為空", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元", "Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！", "Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。", "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。", "Name" => "名稱", "Size" => "大小", -"Modified" => "修改", +"Modified" => "修改時間", "%s could not be renamed" => "無法重新命名 %s", "Upload" => "上傳", "File handling" => "檔案處理", -"Maximum upload size" => "最大上傳檔案大小", +"Maximum upload size" => "上傳限制", "max. possible: " => "最大允許：", -"Needed for multi-file and folder downloads." => "針對多檔案和目錄下載是必填的。", -"Enable ZIP-download" => "啟用 Zip 下載", +"Needed for multi-file and folder downloads." => "下載多檔案和目錄時，此項是必填的。", +"Enable ZIP-download" => "啟用 ZIP 下載", "0 is unlimited" => "0代表沒有限制", -"Maximum input size for ZIP files" => "針對 ZIP 檔案最大輸入大小", +"Maximum input size for ZIP files" => "ZIP 壓縮前的原始大小限制", "Save" => "儲存", "New" => "新增", "Text file" => "文字檔", "Folder" => "資料夾", "From link" => "從連結", -"Deleted files" => "已刪除的檔案", +"Deleted files" => "回收桶", "Cancel upload" => "取消上傳", -"You don’t have write permissions here." => "您在這裡沒有編輯權。", -"Nothing in here. Upload something!" => "這裡什麼也沒有，上傳一些東西吧！", +"You don’t have write permissions here." => "您在這裡沒有編輯權", +"Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！", "Download" => "下載", -"Unshare" => "取消共享", +"Unshare" => "取消分享", "Delete" => "刪除", "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" => "目前掃描", -"Upgrading filesystem cache..." => "正在升級檔案系統快取..." +"Current scanning" => "正在掃描", +"Upgrading filesystem cache..." => "正在升級檔案系統快取…" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php index 56d67ea7ce7..5cc33fd3830 100644 --- a/apps/files_sharing/l10n/zh_TW.php +++ b/apps/files_sharing/l10n/zh_TW.php @@ -1,9 +1,9 @@ "請檢查您的密碼並再試一次。", +"The password is wrong. Try again." => "請檢查您的密碼並再試一次", "Password" => "密碼", "Submit" => "送出", -"Sorry, this link doesn’t seem to work anymore." => "抱歉，這連結看來已經不能用了。", +"Sorry, this link doesn’t seem to work anymore." => "抱歉，此連結已經失效", "Reasons might be:" => "可能的原因：", "the item was removed" => "項目已經移除", "the link expired" => "連結過期", diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php index 0c88d132b5c..9dccc773cb1 100644 --- a/apps/files_trashbin/l10n/pt_PT.php +++ b/apps/files_trashbin/l10n/pt_PT.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Eliminar permanentemente", "Name" => "Nome", "Deleted" => "Apagado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"), +"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "restored" => "Restaurado", "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!", "Restore" => "Restaurar", diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php index 2dfc484fc7f..bfc2fc659de 100644 --- a/apps/files_trashbin/l10n/zh_TW.php +++ b/apps/files_trashbin/l10n/zh_TW.php @@ -11,7 +11,7 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n 個資料夾"), "_%n file_::_%n files_" => array("%n 個檔案"), "restored" => "已還原", -"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！", +"Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！", "Restore" => "還原", "Delete" => "刪除", "Deleted Files" => "已刪除的檔案" diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 84f076f3018..17c3ab293c6 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -1,5 +1,6 @@ "مجموعة", "Category type not provided." => "نوع التصنيف لم يدخل", "No category to add?" => "ألا توجد فئة للإضافة؟", "This category already exists: %s" => "هذا التصنيف موجود مسبقا : %s", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index c389ad01883..a77924b1218 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -1,6 +1,7 @@ "%s ha compartit »%s« amb tu", +"group" => "grup", "Category type not provided." => "No s'ha especificat el tipus de categoria.", "No category to add?" => "No voleu afegir cap categoria?", "This category already exists: %s" => "Aquesta categoria ja existeix: %s", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index d104a9fbe80..1301dae32f3 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -1,6 +1,7 @@ "%s s vámi sdílí »%s«", +"group" => "skupina", "Turned on maintenance mode" => "Zapnut režim údržby", "Turned off maintenance mode" => "Vypnut režim údržby", "Updated database" => "Zaktualizována databáze", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 442970fbb0b..1f6c50524b3 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -1,5 +1,6 @@ "grŵp", "Category type not provided." => "Math o gategori heb ei ddarparu.", "No category to add?" => "Dim categori i'w ychwanegu?", "This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s", diff --git a/core/l10n/da.php b/core/l10n/da.php index 5a1fe65f441..abaea4ba6a5 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,6 +1,7 @@ "%s delte »%s« med sig", +"group" => "gruppe", "Turned on maintenance mode" => "Startede vedligeholdelsestilstand", "Turned off maintenance mode" => "standsede vedligeholdelsestilstand", "Updated database" => "Opdaterede database", diff --git a/core/l10n/de.php b/core/l10n/de.php index 655305488f3..1f205a9db5b 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,6 +1,7 @@ "%s teilte »%s« mit Ihnen", +"group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 2dde9eb5367..6e01b3e2083 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -1,6 +1,7 @@ "%s teilt »%s« mit Ihnen", +"group" => "Gruppe", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 1311a76d693..a29fc4547c6 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,6 +1,7 @@ "%s geteilt »%s« mit Ihnen", +"group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", diff --git a/core/l10n/el.php b/core/l10n/el.php index 51a3a68d788..54c13c89bfa 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -1,6 +1,7 @@ "Ο %s διαμοιράστηκε μαζί σας το »%s«", +"group" => "ομάδα", "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.", "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;", "This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index fc688b103a6..669f677d46d 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -1,6 +1,7 @@ "%s kunhavigis “%s” kun vi", +"group" => "grupo", "Category type not provided." => "Ne proviziĝis tipon de kategorio.", "No category to add?" => "Ĉu neniu kategorio estas aldonota?", "This category already exists: %s" => "Tiu kategorio jam ekzistas: %s", diff --git a/core/l10n/es.php b/core/l10n/es.php index 9e7f5656683..077f677e972 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,6 +1,7 @@ "%s compatido »%s« contigo", +"group" => "grupo", "Category type not provided." => "Tipo de categoría no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index cd51ba2f441..389251de8aa 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -1,6 +1,7 @@ "%s compartió \"%s\" con vos", +"group" => "grupo", "Category type not provided." => "Tipo de categoría no provisto. ", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index d9d007819d3..5391a144349 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,6 +1,7 @@ "%s jagas sinuga »%s«", +"group" => "grupp", "Turned on maintenance mode" => "Haldusreziimis", "Turned off maintenance mode" => "Haldusreziim lõpetatud", "Updated database" => "Uuendatud andmebaas", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index ae241e93873..1e0eb36e1e3 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -1,6 +1,7 @@ "%s-ek »%s« zurekin partekatu du", +"group" => "taldea", "Category type not provided." => "Kategoria mota ez da zehaztu.", "No category to add?" => "Ez dago gehitzeko kategoriarik?", "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index a9e17a194ae..82356c0ab12 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -1,6 +1,7 @@ "%s به اشتراک گذاشته شده است »%s« توسط شما", +"group" => "گروه", "Category type not provided." => "نوع دسته بندی ارائه نشده است.", "No category to add?" => "آیا گروه دیگری برای افزودن ندارید", "This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 7efeaa1fac2..25f5f466ef9 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,6 +1,7 @@ "%s jakoi kohteen »%s« kanssasi", +"group" => "ryhmä", "Turned on maintenance mode" => "Siirrytty ylläpitotilaan", "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", "Updated database" => "Tietokanta ajan tasalla", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 3f85cb1503f..81fad258337 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -1,6 +1,7 @@ "%s partagé »%s« avec vous", +"group" => "groupe", "Category type not provided." => "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: %s" => "Cette catégorie existe déjà : %s", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 56027e4cf1a..663d769ee98 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,6 +1,7 @@ "%s compartiu «%s» con vostede", +"group" => "grupo", "Turned on maintenance mode" => "Modo de mantemento activado", "Turned off maintenance mode" => "Modo de mantemento desactivado", "Updated database" => "Base de datos actualizada", diff --git a/core/l10n/he.php b/core/l10n/he.php index b197a67b116..d5d83fea330 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -1,6 +1,7 @@ "%s שיתף/שיתפה איתך את »%s«", +"group" => "קבוצה", "Category type not provided." => "סוג הקטגוריה לא סופק.", "No category to add?" => "אין קטגוריה להוספה?", "This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index c231d7f9a44..93f96e17847 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -1,6 +1,7 @@ "%s megosztotta Önnel ezt: »%s«", +"group" => "csoport", "Category type not provided." => "Nincs megadva a kategória típusa.", "No category to add?" => "Nincs hozzáadandó kategória?", "This category already exists: %s" => "Ez a kategória már létezik: %s", diff --git a/core/l10n/id.php b/core/l10n/id.php index fc6cb788fb0..0f222918c95 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -1,5 +1,6 @@ "grup", "Category type not provided." => "Tipe kategori tidak diberikan.", "No category to add?" => "Tidak ada kategori yang akan ditambahkan?", "This category already exists: %s" => "Kategori ini sudah ada: %s", diff --git a/core/l10n/it.php b/core/l10n/it.php index 63a7545d891..71f6ffdf50e 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,6 +1,7 @@ "%s ha condiviso «%s» con te", +"group" => "gruppo", "Turned on maintenance mode" => "Modalità di manutenzione attivata", "Turned off maintenance mode" => "Modalità di manutenzione disattivata", "Updated database" => "Database aggiornato", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 2ab85f13d30..82e4153367d 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -1,6 +1,13 @@ "%sが あなたと »%s«を共有しました", +"group" => "グループ", +"Turned on maintenance mode" => "メンテナンスモードがオンになりました", +"Turned off maintenance mode" => "メンテナンスモードがオフになりました", +"Updated database" => "データベース更新完了", +"Updating filecache, this may take really long..." => "ファイルキャッシュを更新しています、しばらく掛かる恐れがあります...", +"Updated filecache" => "ファイルキャッシュ更新完了", +"... %d%% done ..." => "... %d%% 完了 ...", "Category type not provided." => "カテゴリタイプは提供されていません。", "No category to add?" => "追加するカテゴリはありませんか？", "This category already exists: %s" => "このカテゴリはすでに存在します: %s", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 0f4b23906d6..15cacc8b218 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -1,5 +1,6 @@ "ჯგუფი", "Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.", "No category to add?" => "არ არის კატეგორია დასამატებლად?", "This category already exists: %s" => "კატეგორია უკვე არსებობს: %s", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index c4b6b9f091b..0265f38dc07 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -1,5 +1,6 @@ "그룹", "Category type not provided." => "분류 형식이 제공되지 않았습니다.", "No category to add?" => "추가할 분류가 없습니까?", "This category already exists: %s" => "분류가 이미 존재합니다: %s", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 8a5a28957c4..5f4c415bed7 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -1,6 +1,7 @@ "Den/D' %s huet »%s« mat dir gedeelt", +"group" => "Grupp", "Category type not provided." => "Typ vun der Kategorie net uginn.", "No category to add?" => "Keng Kategorie fir bäizesetzen?", "This category already exists: %s" => "Dës Kategorie existéiert schon: %s", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 5db8f6c21a9..7b0c3ed4f80 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,6 +1,7 @@ "%s pasidalino »%s« su tavimi", +"group" => "grupė", "Category type not provided." => "Kategorija nenurodyta.", "No category to add?" => "Nepridėsite jokios kategorijos?", "This category already exists: %s" => "Ši kategorija jau egzistuoja: %s", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index ddfc6008983..57b9186f3cf 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -1,6 +1,7 @@ "%s kopīgots »%s« ar jums", +"group" => "grupa", "Category type not provided." => "Kategorijas tips nav norādīts.", "No category to add?" => "Nav kategoriju, ko pievienot?", "This category already exists: %s" => "Šāda kategorija jau eksistē — %s", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index e2416dc052c..6a8ec50061c 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -1,5 +1,6 @@ "група", "Category type not provided." => "Не беше доставен тип на категорија.", "No category to add?" => "Нема категорија да се додаде?", "Object type not provided." => "Не беше доставен тип на објект.", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 393dc0d7d11..132b65daab2 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,6 +1,7 @@ "%s delte »%s« med deg", +"group" => "gruppe", "No category to add?" => "Ingen kategorier å legge til?", "This category already exists: %s" => "Denne kategorien finnes allerede: %s", "No categories selected for deletion." => "Ingen kategorier merket for sletting.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 6a2d1a03a10..6d5d5dc9917 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -1,6 +1,7 @@ "%s deelde »%s« met jou", +"group" => "groep", "Category type not provided." => "Categorie type niet opgegeven.", "No category to add?" => "Geen categorie om toe te voegen?", "This category already exists: %s" => "Deze categorie bestaat al: %s", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index f73cb96076e..942824ecb74 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -1,5 +1,6 @@ "gruppe", "Category type not provided." => "Ingen kategoritype.", "No category to add?" => "Ingen kategori å leggja til?", "This category already exists: %s" => "Denne kategorien finst alt: %s", diff --git a/core/l10n/oc.php b/core/l10n/oc.php index 68bf2f89a2a..0ca3cc427a0 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -1,5 +1,6 @@ "grop", "No category to add?" => "Pas de categoria d'ajustar ?", "No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.", "Sunday" => "Dimenge", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 1188e555316..48f6dff6184 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,6 +1,7 @@ "%s Współdzielone »%s« z tobą", +"group" => "grupa", "Category type not provided." => "Nie podano typu kategorii.", "No category to add?" => "Brak kategorii do dodania?", "This category already exists: %s" => "Ta kategoria już istnieje: %s", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 8db5262e94b..84762cde5e4 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -1,6 +1,7 @@ "%s compartilhou »%s« com você", +"group" => "grupo", "Category type not provided." => "Tipo de categoria não fornecido.", "No category to add?" => "Nenhuma categoria a adicionar?", "This category already exists: %s" => "Esta categoria já existe: %s", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 25ddaa322d5..2afb9ef9b39 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,6 +1,7 @@ "%s partilhado »%s« contigo", +"group" => "grupo", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: %s" => "A categoria já existe: %s", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 7e33003bcce..ca0e409f71f 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -1,6 +1,7 @@ "%s Partajat »%s« cu tine de", +"group" => "grup", "Category type not provided." => "Tipul de categorie nu a fost specificat.", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: %s" => "Această categorie deja există: %s", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 503ca579ce7..d79326aff32 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -1,6 +1,7 @@ "%s поделился »%s« с вами", +"group" => "группа", "Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: %s" => "Эта категория уже существует: %s", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 475cdf5613a..184566b5f1c 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -1,5 +1,6 @@ "කණ්ඩායම", "No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.", "Sunday" => "ඉරිදා", "Monday" => "සඳුදා", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 82745d617e9..ed061068b4b 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,6 +1,7 @@ "%s s Vami zdieľa »%s«", +"group" => "skupina", "Turned on maintenance mode" => "Mód údržby zapnutý", "Turned off maintenance mode" => "Mód údržby vypnutý", "Updated database" => "Databáza aktualizovaná", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 0b72f1dc4e4..460ca99eeab 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,6 +1,7 @@ "%s je delil »%s« z vami", +"group" => "skupina", "Category type not provided." => "Vrsta kategorije ni podana.", "No category to add?" => "Ali ni kategorije za dodajanje?", "This category already exists: %s" => "Kategorija že obstaja: %s", diff --git a/core/l10n/sr.php b/core/l10n/sr.php index 3de06c70883..89c13c49254 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -1,5 +1,6 @@ "група", "Category type not provided." => "Врста категорије није унет.", "No category to add?" => "Додати још неку категорију?", "Object type not provided." => "Врста објекта није унета.", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 74d285a35a6..9bfd91d2691 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -1,6 +1,7 @@ "%s delade »%s« med dig", +"group" => "Grupp", "Turned on maintenance mode" => "Aktiverade underhållsläge", "Turned off maintenance mode" => "Deaktiverade underhållsläge", "Updated database" => "Uppdaterade databasen", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 3fc461d4284..a1a286275eb 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -1,5 +1,6 @@ "குழு", "Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை", "No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?", "Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index bb5181fd9e6..90fec245c95 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -1,5 +1,6 @@ "กลุ่มผู้ใช้งาน", "Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่", "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?", "Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 6dd54057950..8b6c261d64c 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -1,6 +1,7 @@ "%s sizinle »%s« paylaşımında bulundu", +"group" => "grup", "Category type not provided." => "Kategori türü girilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: %s" => "Bu kategori zaten mevcut: %s", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index eb16e841c67..e77718233de 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -1,5 +1,6 @@ "گۇرۇپپا", "Sunday" => "يەكشەنبە", "Monday" => "دۈشەنبە", "Tuesday" => "سەيشەنبە", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 6fcb23d0a32..8e74855dd08 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -1,5 +1,6 @@ "група", "Category type not provided." => "Не вказано тип категорії.", "No category to add?" => "Відсутні категорії для додавання?", "This category already exists: %s" => "Ця категорія вже існує: %s", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 305839b4760..1ccf03c0aaa 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -1,5 +1,6 @@ "nhóm", "Category type not provided." => "Kiểu hạng mục không được cung cấp.", "No category to add?" => "Không có danh mục được thêm?", "This category already exists: %s" => "Danh mục này đã tồn tại: %s", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 08d70dfee66..ddcc902c8d7 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,6 +1,7 @@ "%s 向您分享了 »%s«", +"group" => "组", "Turned on maintenance mode" => "启用维护模式", "Turned off maintenance mode" => "关闭维护模式", "Updated database" => "数据库已更新", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index fabec7537d1..c25a58dc8ea 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -1,10 +1,17 @@ "%s 與您分享了 %s", +"group" => "群組", +"Turned on maintenance mode" => "已啓用維護模式", +"Turned off maintenance mode" => "已停用維護模式", +"Updated database" => "已更新資料庫", +"Updating filecache, this may take really long..." => "更新檔案快取，這可能要很久…", +"Updated filecache" => "已更新檔案快取", +"... %d%% done ..." => "已完成 %d%%", "Category type not provided." => "未提供分類類型。", "No category to add?" => "沒有可增加的分類？", -"This category already exists: %s" => "分類已經存在： %s", -"Object type not provided." => "不支援的物件類型", +"This category already exists: %s" => "分類已經存在：%s", +"Object type not provided." => "未指定物件類型", "%s ID not provided." => "未提供 %s ID 。", "Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。", "No categories selected for deletion." => "沒有選擇要刪除的分類。", @@ -56,20 +63,20 @@ $TRANSLATIONS = array( "Error while changing permissions" => "修改權限時發生錯誤", "Shared with you and the group {group} by {owner}" => "由 {owner} 分享給您和 {group}", "Shared with you by {owner}" => "{owner} 已經和您分享", -"Share with" => "與...分享", +"Share with" => "分享給別人", "Share with link" => "使用連結分享", "Password protect" => "密碼保護", "Password" => "密碼", "Allow Public Upload" => "允許任何人上傳", "Email link to person" => "將連結 email 給別人", "Send" => "寄出", -"Set expiration date" => "設置到期日", +"Set expiration date" => "指定到期日", "Expiration date" => "到期日", "Share via email:" => "透過電子郵件分享：", "No people found" => "沒有找到任何人", "Resharing is not allowed" => "不允許重新分享", "Shared in {item} with {user}" => "已和 {user} 分享 {item}", -"Unshare" => "取消共享", +"Unshare" => "取消分享", "can edit" => "可編輯", "access control" => "存取控制", "create" => "建立", @@ -77,15 +84,15 @@ $TRANSLATIONS = array( "delete" => "刪除", "share" => "分享", "Password protected" => "受密碼保護", -"Error unsetting expiration date" => "解除過期日設定失敗", -"Error setting expiration date" => "錯誤的到期日設定", -"Sending ..." => "正在傳送...", +"Error unsetting expiration date" => "取消到期日設定失敗", +"Error setting expiration date" => "設定到期日發生錯誤", +"Sending ..." => "正在傳送…", "Email sent" => "Email 已寄出", "The update was unsuccessful. Please report this issue to the ownCloud community." => "升級失敗，請將此問題回報 ownCloud 社群。", "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。", "%s password reset" => "%s 密碼重設", "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}", -"The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", +"The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", "Request failed!
      Did you make sure your email/username was right?" => "請求失敗！
      您確定填入的電子郵件地址或是帳號名稱是正確的嗎？", "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到您的電子郵件信箱。", "Username" => "使用者名稱", @@ -102,8 +109,8 @@ $TRANSLATIONS = array( "Admin" => "管理", "Help" => "說明", "Access forbidden" => "存取被拒", -"Cloud not found" => "未發現雲端", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s", +"Cloud not found" => "找不到網頁", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看", "Edit categories" => "編輯分類", "Add" => "增加", "Security Warning" => "安全性警告", @@ -115,7 +122,7 @@ $TRANSLATIONS = array( "For information how to properly configure your server, please see the documentation." => "請參考說明文件以瞭解如何正確設定您的伺服器。", "Create an admin account" => "建立一個管理者帳號", "Advanced" => "進階", -"Data folder" => "資料夾", +"Data folder" => "資料儲存位置", "Configure the database" => "設定資料庫", "will be used" => "將會使用", "Database user" => "資料庫使用者", @@ -132,8 +139,8 @@ $TRANSLATIONS = array( "Lost your password?" => "忘記密碼？", "remember" => "記住", "Log in" => "登入", -"Alternative Logins" => "替代登入方法", -"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "嗨，

      通知您，%s 與您分享了 %s ，
      看一下吧", -"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。" +"Alternative Logins" => "其他登入方法", +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "嗨，

      通知您一聲，%s 與您分享了 %s ，
      看一下吧", +"Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/l10n/ar/core.po b/l10n/ar/core.po index c9594857940..47fc1f25710 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "مجموعة" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ar/files.po b/l10n/ar/files.po index b8086649e4a..39c537e3a5d 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ibrahim_9090 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 13:30+0000\n" +"Last-Translator: ibrahim_9090 \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" @@ -29,11 +30,11 @@ msgstr "فشل في نقل %s" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "غير قادر على تحميل المجلد" #: ajax/upload.php:22 msgid "Invalid Token" -msgstr "" +msgstr "علامة غير صالحة" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" @@ -76,7 +77,7 @@ msgstr "لا يوجد مساحة تخزينية كافية" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "عملية الرفع فشلت" #: ajax/upload.php:127 msgid "Invalid directory." @@ -92,7 +93,7 @@ msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمه #: js/file-upload.js:24 msgid "Not enough space available" -msgstr "" +msgstr "لا توجد مساحة كافية" #: js/file-upload.js:64 msgid "Upload cancelled." @@ -109,9 +110,9 @@ msgstr "عنوان ال URL لا يجوز أن يكون فارغا." #: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "خطأ" @@ -127,35 +128,35 @@ msgstr "حذف بشكل دائم" msgid "Rename" msgstr "إعادة تسميه" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "قيد الانتظار" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} موجود مسبقا" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "استبدال" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "اقترح إسم" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "إلغاء" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "استبدل {new_name} بـ {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "تراجع" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -165,7 +166,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -175,11 +176,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} و {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -189,9 +190,9 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" -msgstr "" +msgstr "يتم تحميل الملفات" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -219,7 +220,7 @@ msgstr "مساحتك التخزينية امتلأت تقريبا " msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك." #: js/files.js:245 msgid "" @@ -227,15 +228,15 @@ msgid "" "big." msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "اسم" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "حجم" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "معدل" @@ -312,33 +313,33 @@ msgstr "لا تملك صلاحيات الكتابة هنا." msgid "Nothing in here. Upload something!" msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "تحميل" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "إلغاء مشاركة" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "إلغاء" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "حجم الترفيع أعلى من المسموح" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "يرجى الانتظار , جاري فحص الملفات ." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "الفحص الحالي" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index a57ea88b76f..3d91bd55b82 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Качването е неуспешно" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Грешка" @@ -127,57 +127,57 @@ msgstr "Изтриване завинаги" msgid "Rename" msgstr "Преименуване" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Чакащо" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "препокриване" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "отказ" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "възтановяване" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Име" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Размер" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Променено" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Няма нищо тук. Качете нещо." -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Изтегляне" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Изтриване" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Файлът който сте избрали за качване е прекалено голям" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Файловете се претърсват, изчакайте." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 21836c30a8b..6585814d749 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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s ha compartit »%s« amb tu" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 8bedc7b3618..ecc26a9b132 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "No hi ha prou espai disponible" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "La pujada ha fallat" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "La URL no pot ser buida" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -129,57 +129,57 @@ msgstr "Esborra permanentment" msgid "Rename" msgstr "Reanomena" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendent" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} ja existeix" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "substitueix" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugereix un nom" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancel·la" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "s'ha substituït {old_name} per {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "desfés" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n carpeta" msgstr[1] "%n carpetes" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fitxer" msgstr[1] "%n fitxers" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Pujant %n fitxer" msgstr[1] "Pujant %n fitxers" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fitxers pujant" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nom" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Mida" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificat" @@ -302,33 +302,33 @@ msgstr "No teniu permisos d'escriptura aquí." msgid "Nothing in here. Upload something!" msgstr "Res per aquí. Pugeu alguna cosa!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Baixa" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Deixa de compartir" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Esborra" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "La pujada és massa gran" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "S'estan escanejant els fitxers, espereu" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Actualment escanejant" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 41edc0ee8a0..3689101c5df 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 08:00+0000\n" +"Last-Translator: pstast \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" @@ -29,7 +29,7 @@ msgstr "%s s vámi sdílí »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "skupina" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 94cdb7b62b6..503fc964125 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 08:10+0000\n" +"Last-Translator: pstast \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" @@ -80,7 +80,7 @@ msgstr "Nedostatek dostupného úložného prostoru" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Odesílání selhalo" #: ajax/upload.php:127 msgid "Invalid directory." @@ -115,7 +115,7 @@ msgstr "URL nemůže být prázdná." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Chyba" @@ -131,60 +131,60 @@ msgstr "Trvale odstranit" msgid "Rename" msgstr "Přejmenovat" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Nevyřízené" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} již existuje" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "nahradit" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "navrhnout název" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "zrušit" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "nahrazeno {new_name} s {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "vrátit zpět" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n složka" msgstr[1] "%n složky" msgstr[2] "%n složek" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n soubor" msgstr[1] "%n soubory" msgstr[2] "%n souborů" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} a {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávám %n soubor" msgstr[1] "Nahrávám %n soubory" msgstr[2] "Nahrávám %n souborů" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "soubory se odesílají" @@ -222,15 +222,15 @@ msgid "" "big." msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Název" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Velikost" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Upraveno" @@ -307,33 +307,33 @@ msgstr "Nemáte zde práva zápisu." msgid "Nothing in here. Upload something!" msgstr "Žádný obsah. Nahrajte něco." -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Stáhnout" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Zrušit sdílení" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Smazat" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Odesílaný soubor je příliš velký" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Soubory se prohledávají, prosím čekejte." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Aktuální prohledávání" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index 638507e646f..700bfe97729 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grŵp" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index c1e83e56cc9..7507b666b09 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -76,7 +76,7 @@ msgstr "Dim digon o le storio ar gael" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Methwyd llwytho i fyny" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "Does dim hawl cael URL gwag." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Gwall" @@ -127,35 +127,35 @@ msgstr "Dileu'n barhaol" msgid "Rename" msgstr "Ailenwi" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "I ddod" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} yn bodoli'n barod" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "amnewid" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "awgrymu enw" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "diddymu" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "newidiwyd {new_name} yn lle {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "dadwneud" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -163,7 +163,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -171,11 +171,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -183,7 +183,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "ffeiliau'n llwytho i fyny" @@ -221,15 +221,15 @@ msgid "" "big." msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Enw" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Maint" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Addaswyd" @@ -306,33 +306,33 @@ msgstr "Nid oes gennych hawliau ysgrifennu fan hyn." msgid "Nothing in here. Upload something!" msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Llwytho i lawr" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Dad-rannu" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Dileu" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Maint llwytho i fyny'n rhy fawr" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Arhoswch, mae ffeiliau'n cael eu sganio." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Sganio cyfredol" diff --git a/l10n/da/core.po b/l10n/da/core.po index 5c71f405c59..adc2e0f26ca 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -28,7 +28,7 @@ msgstr "%s delte »%s« med sig" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/da/files.po b/l10n/da/files.po index 3f9da02827c..fb180ee25be 100644 --- a/l10n/da/files.po +++ b/l10n/da/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: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 17:27+0000\n" +"Last-Translator: Sappe\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" @@ -79,7 +79,7 @@ msgstr "Der er ikke nok plads til rådlighed" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Upload fejlede" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "URLen kan ikke være tom." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fejl" @@ -130,57 +130,57 @@ msgstr "Slet permanent" msgid "Rename" msgstr "Omdøb" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Afventer" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} eksisterer allerede" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "erstat" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "fortryd" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "erstattede {new_name} med {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "fortryd" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} og {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploader %n fil" msgstr[1] "Uploader %n filer" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "uploader filer" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Navn" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Størrelse" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Ændret" @@ -303,33 +303,33 @@ msgstr "Du har ikke skriverettigheder her." msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Download" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Fjern deling" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Slet" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload er for stor" -#: templates/index.php:107 +#: templates/index.php:110 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:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/de/core.po b/l10n/de/core.po index 23574ea9813..0a572015282 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "%s teilte »%s« mit Ihnen" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "Gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/de/files.po b/l10n/de/files.po index eb931d39214..21a1d8cafb2 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 18:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +82,7 @@ msgstr "Nicht genug Speicher vorhanden." #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Hochladen fehlgeschlagen" #: ajax/upload.php:127 msgid "Invalid directory." @@ -117,7 +117,7 @@ msgstr "Die URL darf nicht leer sein." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fehler" @@ -133,57 +133,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} ersetzt durch {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} und {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -221,15 +221,15 @@ msgid "" "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Name" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Größe" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Geändert" @@ -306,33 +306,33 @@ msgstr "Du hast hier keine Schreib-Berechtigung." msgid "Nothing in here. Upload something!" msgstr "Alles leer. Lade etwas hoch!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Löschen" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index 47c4fa12e7f..9469c953841 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "%s teilt »%s« mit Ihnen" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "Gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po index a1c58799f33..95d27fc4a67 100644 --- a/l10n/de_CH/files.po +++ b/l10n/de_CH/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -85,7 +85,7 @@ msgstr "Nicht genug Speicher vorhanden." #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Hochladen fehlgeschlagen" #: ajax/upload.php:127 msgid "Invalid directory." @@ -120,7 +120,7 @@ msgstr "Die URL darf nicht leer sein." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fehler" @@ -136,57 +136,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n Ordner" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n Dateien" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -224,15 +224,15 @@ msgid "" "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Name" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Grösse" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Geändert" @@ -309,33 +309,33 @@ msgstr "Sie haben hier keine Schreib-Berechtigungen." msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Löschen" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Der Upload ist zu gross" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index 1a3f292dc07..000f19fdda5 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "%s geteilt »%s« mit Ihnen" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "Gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 1282d6306c9..cf3e5f3eb62 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -7,6 +7,7 @@ # SteinQuadrat, 2013 # I Robot , 2013 # Marcel Kühlhorn , 2013 +# Mario Siegmann , 2013 # traductor , 2013 # noxin , 2013 # Mirodin , 2013 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 18:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,7 +85,7 @@ msgstr "Nicht genug Speicher vorhanden." #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Hochladen fehlgeschlagen" #: ajax/upload.php:127 msgid "Invalid directory." @@ -119,7 +120,7 @@ msgstr "Die URL darf nicht leer sein." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fehler" @@ -135,57 +136,57 @@ msgstr "Endgültig löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} und {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hoch geladen" msgstr[1] "%n Dateien werden hoch geladen" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "Dateien werden hoch geladen" @@ -223,15 +224,15 @@ msgid "" "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Name" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Größe" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Geändert" @@ -308,33 +309,33 @@ msgstr "Sie haben hier keine Schreib-Berechtigungen." msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Löschen" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/el/core.po b/l10n/el/core.po index 31ff37b3eeb..ca0b80f304b 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -31,7 +31,7 @@ msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "ομάδα" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/el/files.po b/l10n/el/files.po index 50dcd3f9477..bd017bcd8e7 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώ #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Η μεταφόρτωση απέτυχε" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "Η URL δεν μπορεί να είναι κενή." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Σφάλμα" @@ -130,57 +130,57 @@ msgstr "Μόνιμη διαγραφή" msgid "Rename" msgstr "Μετονομασία" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Εκκρεμεί" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} υπάρχει ήδη" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "αντικαταστάθηκε το {new_name} με {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n φάκελος" msgstr[1] "%n φάκελοι" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n αρχείο" msgstr[1] "%n αρχεία" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Ανέβασμα %n αρχείου" msgstr[1] "Ανέβασμα %n αρχείων" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "αρχεία ανεβαίνουν" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Όνομα" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Μέγεθος" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Τροποποιήθηκε" @@ -303,33 +303,33 @@ msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ." msgid "Nothing in here. Upload something!" msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Λήψη" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Σταμάτημα διαμοιρασμού" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Διαγραφή" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Πολύ μεγάλο αρχείο προς αποστολή" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Τρέχουσα ανίχνευση" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index 26e1f3c14a9..95570ce896f 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:40+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po index 04300969e06..f7d558ebe2a 100644 --- a/l10n/en_GB/files.po +++ b/l10n/en_GB/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:40+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "URL cannot be empty." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -128,57 +128,57 @@ msgstr "Delete permanently" msgid "Rename" msgstr "Rename" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pending" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} already exists" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "replace" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "suggest name" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancel" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "replaced {new_name} with {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "undo" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n folder" msgstr[1] "%n folders" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n files" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "{dirs} and {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploading %n file" msgstr[1] "Uploading %n files" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "files uploading" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Name" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Size" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modified" @@ -301,33 +301,33 @@ msgstr "You don’t have write permission here." msgid "Nothing in here. Upload something!" msgstr "Nothing in here. Upload something!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Download" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Unshare" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Delete" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload too large" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Files are being scanned, please wait." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Current scanning" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index 1c4e9c35417..dd1d6ebc5e2 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s kunhavigis “%s” kun vi" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/eo/files.po b/l10n/eo/files.po index af8d82e0aab..3db69832bef 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Ne haveblas sufiĉa memoro" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Alŝuto malsukcesis" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL ne povas esti malplena." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Eraro" @@ -128,57 +128,57 @@ msgstr "Forigi por ĉiam" msgid "Rename" msgstr "Alinomigi" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Traktotaj" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} jam ekzistas" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "anstataŭigi" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugesti nomon" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "nuligi" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "anstataŭiĝis {new_name} per {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "malfari" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "dosieroj estas alŝutataj" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nomo" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Grando" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modifita" @@ -301,33 +301,33 @@ msgstr "Vi ne havas permeson skribi ĉi tie." msgid "Nothing in here. Upload something!" msgstr "Nenio estas ĉi tie. Alŝutu ion!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Elŝuti" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Malkunhavigi" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Forigi" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Alŝuto tro larĝa" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Dosieroj estas skanataj, bonvolu atendi." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Nuna skano" diff --git a/l10n/es/core.po b/l10n/es/core.po index d700f044722..4a006b413d6 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -33,7 +33,7 @@ msgstr "%s compatido »%s« contigo" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/es/files.po b/l10n/es/files.po index 764ab8c2f26..150143b933d 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -81,7 +81,7 @@ msgstr "No hay suficiente espacio disponible" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Error en la subida" #: ajax/upload.php:127 msgid "Invalid directory." @@ -116,7 +116,7 @@ msgstr "La URL no puede estar vacía." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -132,57 +132,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renombrar" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendiente" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "reemplazado {new_name} con {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "deshacer" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "subiendo archivos" @@ -220,15 +220,15 @@ msgid "" "big." msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nombre" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamaño" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificado" @@ -305,33 +305,33 @@ msgstr "No tiene permisos de escritura aquí." msgid "Nothing in here. Upload something!" msgstr "No hay nada aquí. ¡Suba algo!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Descargar" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Subida demasido grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Los archivos están siendo escaneados, por favor espere." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 45ab92b80c1..43f652d3a58 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dharth , 2013 # pablomillaquen , 2013 # xhiena , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 23:40+0000\n" +"Last-Translator: Dharth \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" @@ -24,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud" #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "No se ha especificado nombre de la aplicación" #: app.php:361 msgid "Help" @@ -88,44 +89,44 @@ msgstr "Descargue los archivos en trozos más pequeños, por separado o solicít #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "No se ha especificado origen cuando se ha instalado la aplicación" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "No href especificado cuando se ha instalado la aplicación" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Sin path especificado cuando se ha instalado la aplicación desde el fichero local" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Ficheros de tipo %s no son soportados" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Fallo de apertura de fichero mientras se instala la aplicación" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "La aplicación no suministra un fichero info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "La aplicación no puede ser instalada por tener código no autorizado en la aplicación" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n\ntrue\n\nque no está permitida para aplicaciones no distribuidas" #: installer.php:150 msgid "" @@ -266,51 +267,51 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir si msgid "Please double check the installation guides." msgstr "Por favor, vuelva a comprobar las guías de instalación." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "hace segundos" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "hoy" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "ayer" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "mes pasado" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "año pasado" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "hace años" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index ee3f80addf2..6dd2898c492 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "%s compartió \"%s\" con vos" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 9e7e5a0922a..3a53061ec69 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "No hay suficiente almacenamiento" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Error al subir el archivo" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "La URL no puede estar vacía" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -130,57 +130,57 @@ msgstr "Borrar permanentemente" msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendientes" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "se reemplazó {new_name} con {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "deshacer" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "Subiendo archivos" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nombre" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamaño" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificado" @@ -303,33 +303,33 @@ msgstr "No tenés permisos de escritura acá." msgid "Nothing in here. Upload something!" msgstr "No hay nada. ¡Subí contenido!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Descargar" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Borrar" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "El tamaño del archivo que querés subir es demasiado grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo " -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor esperá." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 7b3a992357f..95b66e51b7a 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s jagas sinuga »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupp" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index f69d10f72ec..79f5e340cfb 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "Saadaval pole piisavalt ruumi" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Üleslaadimine ebaõnnestus" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "URL ei saa olla tühi." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Viga" @@ -129,57 +129,57 @@ msgstr "Kustuta jäädavalt" msgid "Rename" msgstr "Nimeta ümber" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ootel" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} on juba olemas" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "asenda" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "soovita nime" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "loobu" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "asendas nime {old_name} nimega {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "tagasi" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kataloog" msgstr[1] "%n kataloogi" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fail" msgstr[1] "%n faili" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laadin üles %n faili" msgstr[1] "Laadin üles %n faili" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "faili üleslaadimisel" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. " -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nimi" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Suurus" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Muudetud" @@ -302,33 +302,33 @@ msgstr "Siin puudvad sul kirjutamisõigused." msgid "Nothing in here. Upload something!" msgstr "Siin pole midagi. Lae midagi üles!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Lae alla" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Lõpeta jagamine" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Kustuta" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Üleslaadimine on liiga suur" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Faile skannitakse, palun oota." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Praegune skannimine" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 004b38fc512..962c4efed51 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s-ek »%s« zurekin partekatu du" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "taldea" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index bb64b84c230..4456f2df9e3 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "Ez dago behar aina leku erabilgarri," #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "igotzeak huts egin du" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "URLa ezin da hutsik egon." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Errorea" @@ -129,57 +129,57 @@ msgstr "Ezabatu betirako" msgid "Rename" msgstr "Berrizendatu" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Zain" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} dagoeneko existitzen da" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr " {new_name}-k {old_name} ordezkatu du" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "desegin" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "karpeta %n" msgstr[1] "%n karpeta" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "fitxategi %n" msgstr[1] "%n fitxategi" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Fitxategi %n igotzen" msgstr[1] "%n fitxategi igotzen" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fitxategiak igotzen" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. " -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Izena" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamaina" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Aldatuta" @@ -302,33 +302,33 @@ msgstr "Ez duzu hemen idazteko baimenik." msgid "Nothing in here. Upload something!" msgstr "Ez dago ezer. Igo zerbait!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Deskargatu" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Ez elkarbanatu" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Ezabatu" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Igoera handiegia da" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Orain eskaneatzen ari da" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index 4fb8afd07bb..477f3475fc5 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "گروه" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 362a1dc80ae..1db2606ef50 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "فضای کافی در دسترس نیست" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "بارگزاری ناموفق بود" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL نمی تواند خالی باشد." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "خطا" @@ -128,54 +128,54 @@ msgstr "حذف قطعی" msgid "Rename" msgstr "تغییرنام" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "در انتظار" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{نام _جدید} در حال حاضر وجود دارد." -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "جایگزین" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "پیشنهاد نام" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "لغو" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد." -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "بازگشت" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "بارگذاری فایل ها" @@ -213,15 +213,15 @@ msgid "" "big." msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "نام" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "اندازه" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "تاریخ" @@ -298,33 +298,33 @@ msgstr "شما اجازه ی نوشتن در اینجا را ندارید" msgid "Nothing in here. Upload something!" msgstr "اینجا هیچ چیز نیست." -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "دانلود" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "لغو اشتراک" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "حذف" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "بازرسی کنونی" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 56d1039db0f..f76c82e4827 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s jakoi kohteen »%s« kanssasi" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "ryhmä" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 69f2485ac90..2c0837f88bc 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 17:20+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -77,7 +77,7 @@ msgstr "Tallennustilaa ei ole riittävästi käytettävissä" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Lähetys epäonnistui" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "Verkko-osoite ei voi olla tyhjä" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Virhe" @@ -128,57 +128,57 @@ msgstr "Poista pysyvästi" msgid "Rename" msgstr "Nimeä uudelleen" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Odottaa" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} on jo olemassa" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "korvaa" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "ehdota nimeä" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "peru" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "kumoa" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kansio" msgstr[1] "%n kansiota" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n tiedosto" msgstr[1] "%n tiedostoa" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} ja {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lähetetään %n tiedosto" msgstr[1] "Lähetetään %n tiedostoa" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nimi" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Koko" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Muokattu" @@ -301,33 +301,33 @@ msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne." msgid "Nothing in here. Upload something!" msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Lataa" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Peru jakaminen" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Poista" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Lähetettävä tiedosto on liian suuri" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Tiedostoja tarkistetaan, odota hetki." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 5aaca8e3f70..f5b034ae31c 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -29,7 +29,7 @@ msgstr "%s partagé »%s« avec vous" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "groupe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index bd1b9b97978..245c7abab6b 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Plus assez d'espace de stockage disponible" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Échec de l'envoi" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "L'URL ne peut-être vide" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Erreur" @@ -130,57 +130,57 @@ msgstr "Supprimer de façon définitive" msgid "Rename" msgstr "Renommer" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "En attente" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} existe déjà" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "remplacer" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Suggérer un nom" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "annuler" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} a été remplacé par {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "annuler" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fichiers en cours d'envoi" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nom" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Taille" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modifié" @@ -303,33 +303,33 @@ msgstr "Vous n'avez pas le droit d'écriture ici." msgid "Nothing in here. Upload something!" msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Télécharger" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Ne plus partager" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Supprimer" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Téléversement trop volumineux" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Analyse en cours" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index ed5c0b1b091..6565f0ea8d9 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "%s compartiu «%s» con vostede" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index f655969e064..6de09cdb0f7 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Non hai espazo de almacenamento abondo" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Produciuse un fallou no envío" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "O URL non pode quedar baleiro." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Erro" @@ -128,57 +128,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendentes" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "Xa existe un {new_name}" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "substituír" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "suxerir nome" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "substituír {new_name} por {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "desfacer" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartafol" msgstr[1] "%n cartafoles" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n ficheiro" msgstr[1] "%n ficheiros" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Cargando %n ficheiro" msgstr[1] "Cargando %n ficheiros" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "ficheiros enviándose" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nome" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamaño" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificado" @@ -301,33 +301,33 @@ msgstr "Non ten permisos para escribir aquí." msgid "Nothing in here. Upload something!" msgstr "Aquí non hai nada. Envíe algo." -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Descargar" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Deixar de compartir" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Envío demasiado grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Estanse analizando os ficheiros. Agarde." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/he/core.po b/l10n/he/core.po index ccf747517c2..a505ffebd53 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s שיתף/שיתפה איתך את »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "קבוצה" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/he/files.po b/l10n/he/files.po index 9002e898ceb..dd480450974 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "אין די שטח פנוי באחסון" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "ההעלאה נכשלה" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "קישור אינו יכול להיות ריק." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "שגיאה" @@ -128,57 +128,57 @@ msgstr "מחק לצמיתות" msgid "Rename" msgstr "שינוי שם" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "ממתין" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} כבר קיים" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "החלפה" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "הצעת שם" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ביטול" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} הוחלף ב־{old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "ביטול" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "קבצים בהעלאה" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "שם" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "גודל" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "זמן שינוי" @@ -301,33 +301,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "הורדה" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "הסר שיתוף" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "מחיקה" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "העלאה גדולה מידי" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "הקבצים נסרקים, נא להמתין." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "הסריקה הנוכחית" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 85a6b3a0d1d..b4bbc396445 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s megosztotta Önnel ezt: »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "csoport" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 48876d9d474..402bd723361 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Nincs elég szabad hely." #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "A feltöltés nem sikerült" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "Az URL nem lehet semmi." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Hiba" @@ -128,57 +128,57 @@ msgstr "Végleges törlés" msgid "Rename" msgstr "Átnevezés" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} már létezik" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "írjuk fölül" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "legyen más neve" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "mégse" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "visszavonás" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fájl töltődik föl" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Név" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Méret" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Módosítva" @@ -301,33 +301,33 @@ msgstr "Itt nincs írásjoga." msgid "Nothing in here. Upload something!" msgstr "Itt nincs semmi. Töltsön fel valamit!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Letöltés" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "A megosztás visszavonása" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Törlés" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "A feltöltés túl nagy" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Ellenőrzés alatt" diff --git a/l10n/id/core.po b/l10n/id/core.po index 51d44b0f572..071ac769a96 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/it/core.po b/l10n/it/core.po index 9a45ffabc38..e5cdd51793d 100644 --- a/l10n/it/core.po +++ b/l10n/it/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -27,7 +27,7 @@ msgstr "%s ha condiviso «%s» con te" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "gruppo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/it/files.po b/l10n/it/files.po index 6b88648425a..58b33501e9e 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 15:54+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" @@ -78,7 +78,7 @@ msgstr "Spazio di archiviazione insufficiente" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Caricamento non riuscito" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "L'URL non può essere vuoto." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Errore" @@ -129,57 +129,57 @@ msgstr "Elimina definitivamente" msgid "Rename" msgstr "Rinomina" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "In corso" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} esiste già" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "sostituisci" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "suggerisci nome" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "annulla" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "sostituito {new_name} con {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "annulla" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartella" msgstr[1] "%n cartelle" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n file" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Caricamento di %n file in corso" msgstr[1] "Caricamento di %n file in corso" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "caricamento file" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nome" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Dimensione" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificato" @@ -302,33 +302,33 @@ msgstr "Qui non hai i permessi di scrittura." msgid "Nothing in here. Upload something!" msgstr "Non c'è niente qui. Carica qualcosa!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Scarica" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Rimuovi condivisione" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Elimina" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Caricamento troppo grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Scansione dei file in corso, attendi" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Scansione corrente" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index e119006c71e..fb5632409a4 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -4,14 +4,15 @@ # # Translators: # Francesco Capuano , 2013 +# polxmod , 2013 # Vincenzo Reale , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-29 19:30+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 13:30+0000\n" +"Last-Translator: polxmod \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" @@ -125,7 +126,7 @@ msgstr "L'applicazione non può essere installata poiché non è compatibile con msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "L'applicazione non può essere installata poiché contiene il tag true che non è permesso alle applicazioni non shipped" #: installer.php:150 msgid "" @@ -266,51 +267,51 @@ msgstr "Il tuo server web non è configurato correttamente per consentire la sin msgid "Please double check the installation guides." msgstr "Leggi attentamente le guide d'installazione." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "secondi fa" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "oggi" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "ieri" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "mese scorso" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "anno scorso" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "anni fa" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 57cb219901f..2ef86dac439 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -5,14 +5,15 @@ # Translators: # Francesco Apruzzese , 2013 # idetao , 2013 +# polxmod , 2013 # Vincenzo Reale , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 15:53+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" @@ -87,47 +88,47 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s" msgid "Couldn't update app." msgstr "Impossibile aggiornate l'applicazione." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aggiorna a {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Disabilita" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Abilita" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Attendere..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Errore durante la disattivazione" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Errore durante l'attivazione" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aggiornamento in corso..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Errore durante l'aggiornamento" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Errore" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aggiorna" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aggiornato" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 7effb5774b6..38ce1ffd25b 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 09:50+0000\n" +"Last-Translator: plazmism \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" @@ -28,32 +28,32 @@ msgstr "%sが あなたと »%s«を共有しました" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "グループ" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "メンテナンスモードがオンになりました" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "メンテナンスモードがオフになりました" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "データベース更新完了" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "ファイルキャッシュを更新しています、しばらく掛かる恐れがあります..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "ファイルキャッシュ更新完了" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% 完了 ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index b8591173f30..249beb05f61 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/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: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 00:40+0000\n" +"Last-Translator: tt yn \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" @@ -81,7 +81,7 @@ msgstr "ストレージに十分な空き容量がありません" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "アップロードに失敗" #: ajax/upload.php:127 msgid "Invalid directory." @@ -116,7 +116,7 @@ msgstr "URLは空にできません。" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "エラー" @@ -132,54 +132,54 @@ msgstr "完全に削除する" msgid "Rename" msgstr "名前の変更" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "中断" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} はすでに存在しています" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "置き換え" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} を {new_name} に置換" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n個のフォルダ" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n個のファイル" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} と {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個のファイルをアップロード中" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "ファイルをアップロード中" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "名前" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "サイズ" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "変更" @@ -302,33 +302,33 @@ msgstr "あなたには書き込み権限がありません。" msgid "Nothing in here. Upload something!" msgstr "ここには何もありません。何かアップロードしてください。" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "ダウンロード" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "共有解除" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "削除" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "アップロードには大きすぎます。" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "ファイルをスキャンしています、しばらくお待ちください。" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "スキャン中" diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index 3d14cbeb36d..78f82700487 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 01:10+0000\n" +"Last-Translator: tt yn \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" @@ -24,11 +24,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。" #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "アプリ名が未指定" #: app.php:361 msgid "Help" @@ -88,38 +88,38 @@ msgstr "ファイルは、小さいファイルに分割されてダウンロー #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "アプリインストール時のソースが未指定" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "アプリインストール時のhttpの URL が未指定" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "アプリインストール時のローカルファイルのパスが未指定" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "\"%s\"タイプのアーカイブ形式は未サポート" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "アプリをインストール中にアーカイブファイルを開けませんでした。" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "アプリにinfo.xmlファイルが入っていません" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "アプリで許可されないコードが入っているのが原因でアプリがインストールできません" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。" #: installer.php:144 msgid "" @@ -131,16 +131,16 @@ msgstr "" msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "アプリディレクトリは既に存在します" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。" #: json.php:28 msgid "Application is not enabled" @@ -266,47 +266,47 @@ msgstr "WebDAVインタフェースが動作していないと考えられるた msgid "Please double check the installation guides." msgstr "インストールガイドをよく確認してください。" -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "数秒前" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分前" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 時間後" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "今日" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "昨日" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "%n 日後" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "一月前" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n カ月後" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "一年前" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "年前" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index f61f73ba228..e265ca7d475 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 00:40+0000\n" +"Last-Translator: tt yn \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" @@ -87,47 +87,47 @@ msgstr "ユーザをグループ %s から削除できません" msgid "Couldn't update app." msgstr "アプリを更新出来ませんでした。" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} に更新" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "無効" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "有効化" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "しばらくお待ちください。" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "アプリ無効化中にエラーが発生" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "アプリ有効化中にエラーが発生" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "更新中...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "アプリの更新中にエラーが発生" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "エラー" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "更新" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "更新済み" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 5611a467957..8cd45561ae0 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "ჯგუფი" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index b162233b9c0..36a1787cd34 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "საცავში საკმარისი ადგილი ა #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "ატვირთვა ვერ განხორციელდა" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "URL არ შეიძლება იყოს ცარიელი." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "შეცდომა" @@ -127,54 +127,54 @@ msgstr "სრულად წაშლა" msgid "Rename" msgstr "გადარქმევა" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "მოცდის რეჟიმში" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} უკვე არსებობს" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "შეცვლა" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "სახელის შემოთავაზება" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "უარყოფა" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} შეცვლილია {old_name}–ით" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "დაბრუნება" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "ფაილები იტვირთება" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "სახელი" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "ზომა" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "შეცვლილია" @@ -297,33 +297,33 @@ msgstr "თქვენ არ გაქვთ ჩაწერის უფლ msgid "Nothing in here. Upload something!" msgstr "აქ არაფერი არ არის. ატვირთე რამე!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "ჩამოტვირთვა" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "გაუზიარებადი" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "წაშლა" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "ასატვირთი ფაილი ძალიან დიდია" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "მიმდინარე სკანირება" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index 414603b41db..5e7d67575a2 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "그룹" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index f7c84013950..f97b6b2dd26 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "저장소가 용량이 충분하지 않습니다." #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "업로드 실패" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "URL을 입력해야 합니다." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "오류" @@ -129,54 +129,54 @@ msgstr "영원히 삭제" msgid "Rename" msgstr "이름 바꾸기" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "대기 중" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name}이(가) 이미 존재함" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "바꾸기" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "이름 제안" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "취소" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{old_name}이(가) {new_name}(으)로 대체됨" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "되돌리기" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "파일 업로드중" @@ -214,15 +214,15 @@ msgid "" "big." msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "이름" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "크기" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "수정됨" @@ -299,33 +299,33 @@ msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다." msgid "Nothing in here. Upload something!" msgstr "내용이 없습니다. 업로드할 수 있습니다!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "다운로드" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "공유 해제" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "삭제" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "업로드한 파일이 너무 큼" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "파일을 검색하고 있습니다. 기다려 주십시오." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "현재 검색" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 6acfd95e044..73f9dacaf60 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "Den/D' %s huet »%s« mat dir gedeelt" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "Grupp" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 493b46ace2c..6f77486ddf4 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -27,7 +27,7 @@ msgstr "%s pasidalino »%s« su tavimi" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupė" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 6fe0fe92913..af72860fc58 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Nepakanka vietos serveryje" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Nusiuntimas nepavyko" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL negali būti tuščias." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Klaida" @@ -128,60 +128,60 @@ msgstr "Ištrinti negrįžtamai" msgid "Rename" msgstr "Pervadinti" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Laukiantis" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} jau egzistuoja" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "pakeisti" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "pasiūlyti pavadinimą" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "atšaukti" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "pakeiskite {new_name} į {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "anuliuoti" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "įkeliami failai" @@ -219,15 +219,15 @@ msgid "" "big." msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Pavadinimas" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Dydis" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Pakeista" @@ -304,33 +304,33 @@ msgstr "Jūs neturite rašymo leidimo." msgid "Nothing in here. Upload something!" msgstr "Čia tuščia. Įkelkite ką nors!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Atsisiųsti" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Nebesidalinti" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Ištrinti" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Įkėlimui failas per didelis" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Skenuojami failai, prašome palaukti." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Šiuo metu skenuojama" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 689ad0da124..65e8cfde0e4 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "%s kopīgots »%s« ar jums" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupa" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index 5eff48359db..ac1b1e7ab6b 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Nav pietiekami daudz vietas" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Neizdevās augšupielādēt" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL nevar būt tukšs." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Kļūda" @@ -128,60 +128,60 @@ msgstr "Dzēst pavisam" msgid "Rename" msgstr "Pārsaukt" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Gaida savu kārtu" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} jau eksistē" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "aizvietot" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "ieteiktais nosaukums" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "atcelt" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "aizvietoja {new_name} ar {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "atsaukt" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapes" msgstr[1] "%n mape" msgstr[2] "%n mapes" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n faili" msgstr[1] "%n fails" msgstr[2] "%n faili" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n" msgstr[1] "Augšupielāde %n failu" msgstr[2] "Augšupielāde %n failus" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fails augšupielādējas" @@ -219,15 +219,15 @@ msgid "" "big." msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nosaukums" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Izmērs" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Mainīts" @@ -304,33 +304,33 @@ msgstr "Jums nav tiesību šeit rakstīt." msgid "Nothing in here. Upload something!" msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Lejupielādēt" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Pārtraukt dalīšanos" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Dzēst" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Datne ir par lielu, lai to augšupielādētu" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Šobrīd tiek caurskatīts" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index c94527ab533..a426e2ec182 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "група" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 4bd2753d756..68b8f11bed3 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "%s delte »%s« med deg" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index c59874212be..21093f1c7e0 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Ikke nok lagringsplass" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Opplasting feilet" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "URL-en kan ikke være tom." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Feil" @@ -130,57 +130,57 @@ msgstr "Slett permanent" msgid "Rename" msgstr "Gi nytt navn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ventende" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} finnes allerede" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "erstatt" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "erstattet {new_name} med {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "angre" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laster opp %n fil" msgstr[1] "Laster opp %n filer" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "filer lastes opp" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Navn" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Størrelse" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Endret" @@ -303,33 +303,33 @@ msgstr "Du har ikke skrivetilgang her." msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Last ned" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Avslutt deling" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Slett" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Filen er for stor" -#: templates/index.php:107 +#: templates/index.php:110 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:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Skanner filer, vennligst vent." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Pågående skanning" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 340455fdb1e..c7b2e1c117b 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -27,7 +27,7 @@ msgstr "%s deelde »%s« met jou" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "groep" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 1ef60e724ab..c42cf442efe 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "Niet genoeg opslagruimte beschikbaar" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Upload mislukt" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "URL kan niet leeg zijn." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fout" @@ -129,57 +129,57 @@ msgstr "Verwijder definitief" msgid "Rename" msgstr "Hernoem" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "In behandeling" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} bestaat al" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "vervang" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Stel een naam voor" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "annuleren" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "verving {new_name} met {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "ongedaan maken" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n mappen" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n bestanden" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n bestand aan het uploaden" msgstr[1] "%n bestanden aan het uploaden" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "bestanden aan het uploaden" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Naam" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Grootte" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Aangepast" @@ -302,33 +302,33 @@ msgstr "U hebt hier geen schrijfpermissies." msgid "Nothing in here. Upload something!" msgstr "Er bevindt zich hier niets. Upload een bestand!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Downloaden" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Stop met delen" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Verwijder" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload is te groot" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Bestanden worden gescand, even wachten." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Er wordt gescand" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index dd3e636cc48..8772791ae01 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index be3bfcba3ee..623cceba50c 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Feil ved opplasting" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "Nettadressa kan ikkje vera tom." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Feil" @@ -129,57 +129,57 @@ msgstr "Slett for godt" msgid "Rename" msgstr "Endra namn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Under vegs" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} finst allereie" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "byt ut" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "føreslå namn" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "bytte ut {new_name} med {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "angre" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "filer lastar opp" @@ -217,15 +217,15 @@ msgid "" "big." msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Namn" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Storleik" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Endra" @@ -302,33 +302,33 @@ msgstr "Du har ikkje skriverettar her." msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last noko opp!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Last ned" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Udel" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Slett" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "For stor opplasting" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Skannar filer, ver venleg og vent." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Køyrande skanning" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index f419c3efaf3..5b2896c6e35 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grop" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index edaed21e00e..6680a8ba6b3 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s Współdzielone »%s« z tobą" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupa" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index fc486609894..8bab0cf5908 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -78,7 +78,7 @@ msgstr "Za mało dostępnego miejsca" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Wysyłanie nie powiodło się" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +113,7 @@ msgstr "URL nie może być pusty." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Błąd" @@ -129,60 +129,60 @@ msgstr "Trwale usuń" msgid "Rename" msgstr "Zmień nazwę" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Oczekujące" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} już istnieje" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "zastąp" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "zasugeruj nazwę" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "anuluj" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "zastąpiono {new_name} przez {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "cofnij" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "pliki wczytane" @@ -220,15 +220,15 @@ msgid "" "big." msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nazwa" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Rozmiar" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modyfikacja" @@ -305,33 +305,33 @@ msgstr "Nie masz uprawnień do zapisu w tym miejscu." msgid "Nothing in here. Upload something!" msgstr "Pusto. Wyślij coś!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Pobierz" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Zatrzymaj współdzielenie" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Usuń" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Ładowany plik jest za duży" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Skanowanie plików, proszę czekać." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Aktualnie skanowane" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 44989e4aad8..b3280313839 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s compartilhou »%s« com você" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 5f0718ae9da..4397a9890b0 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Espaço de armazenamento insuficiente" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Falha no envio" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "URL não pode ficar em branco" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Erro" @@ -130,57 +130,57 @@ msgstr "Excluir permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} já existe" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "substituir" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugerir nome" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "Substituído {old_name} por {new_name} " -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "desfazer" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "enviando arquivos" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nome" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamanho" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificado" @@ -303,33 +303,33 @@ msgstr "Você não possui permissão de escrita aqui." msgid "Nothing in here. Upload something!" msgstr "Nada aqui.Carrege alguma coisa!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Baixar" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Descompartilhar" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Excluir" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Arquivos sendo escaneados, por favor aguarde." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Scanning atual" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index e188e5ccc38..ee257663691 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -28,7 +28,7 @@ msgstr "%s partilhado »%s« contigo" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 78b08930414..21d8f249a2b 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -5,13 +5,14 @@ # Translators: # bmgmatias , 2013 # FernandoMASilva, 2013 +# Helder Meneses , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 14:50+0000\n" +"Last-Translator: Helder Meneses \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" @@ -78,7 +79,7 @@ msgstr "Não há espaço suficiente em disco" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Carregamento falhou" #: ajax/upload.php:127 msgid "Invalid directory." @@ -113,7 +114,7 @@ msgstr "O URL não pode estar vazio." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Erro" @@ -129,57 +130,57 @@ msgstr "Eliminar permanentemente" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "O nome {new_name} já existe" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "substituir" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugira um nome" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "substituido {new_name} por {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "desfazer" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n pasta" +msgstr[1] "%n pastas" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n ficheiro" +msgstr[1] "%n ficheiros" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "A carregar %n ficheiro" +msgstr[1] "A carregar %n ficheiros" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "A enviar os ficheiros" @@ -209,7 +210,7 @@ msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros." #: js/files.js:245 msgid "" @@ -217,15 +218,15 @@ msgid "" "big." msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nome" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Tamanho" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificado" @@ -302,33 +303,33 @@ msgstr "Não tem permissões de escrita aqui." msgid "Nothing in here. Upload something!" msgstr "Vazio. Envie alguma coisa!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Transferir" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Deixar de partilhar" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Os ficheiros estão a ser analisados, por favor aguarde." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index e23fb508d18..64a86f404cf 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 14:50+0000\n" +"Last-Translator: Helder Meneses \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" @@ -28,43 +28,43 @@ msgstr "Não foi possível eliminar %s de forma permanente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "executar a operação de restauro" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Erro" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "Eliminar permanentemente o(s) ficheiro(s)" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Apagado" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n pasta" +msgstr[1] "%n pastas" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n ficheiro" +msgstr[1] "%n ficheiros" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "Restaurado" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 3e43edd8945..e2768600954 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 14:50+0000\n" +"Last-Translator: Helder Meneses \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" @@ -88,53 +88,53 @@ msgstr "Impossível apagar utilizador do grupo %s" msgid "Couldn't update app." msgstr "Não foi possível actualizar a aplicação." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar para a versão {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactivar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Por favor aguarde..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Erro enquanto desactivava a aplicação" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Erro enquanto activava a aplicação" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "A Actualizar..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Erro enquanto actualizava a aplicação" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Erro" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizado" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo." #: js/personal.js:172 msgid "Saving..." @@ -483,15 +483,15 @@ msgstr "Encriptação" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Password de entrada" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Desencriptar todos os ficheiros" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 93a50da14d5..6cbf39f5e00 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -28,7 +28,7 @@ msgstr "%s Partajat »%s« cu tine de" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 6c1b9795dad..c25183110d0 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Nu este suficient spațiu disponibil" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Încărcarea a eșuat" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "Adresa URL nu poate fi goală." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Eroare" @@ -130,60 +130,60 @@ msgstr "Stergere permanenta" msgid "Rename" msgstr "Redenumire" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "În așteptare" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} deja exista" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "înlocuire" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugerează nume" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "anulare" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} inlocuit cu {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "Anulează ultima acțiune" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fișiere se încarcă" @@ -221,15 +221,15 @@ msgid "" "big." msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nume" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Dimensiune" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificat" @@ -306,33 +306,33 @@ msgstr "Nu ai permisiunea de a sterge fisiere aici." msgid "Nothing in here. Upload something!" msgstr "Nimic aici. Încarcă ceva!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Descarcă" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Anulare partajare" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Șterge" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Fișierul încărcat este prea mare" -#: templates/index.php:107 +#: templates/index.php:110 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:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Fișierele sunt scanate, te rog așteptă." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "În curs de scanare" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 59c411b7209..7721c948b2e 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -32,7 +32,7 @@ msgstr "%s поделился »%s« с вами" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "группа" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 7a7e2c74f9e..a97a10cc9ad 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -81,7 +81,7 @@ msgstr "Недостаточно доступного места в хранил #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Ошибка загрузки" #: ajax/upload.php:127 msgid "Invalid directory." @@ -116,7 +116,7 @@ msgstr "Ссылка не может быть пустой." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Ошибка" @@ -132,60 +132,60 @@ msgstr "Удалено навсегда" msgid "Rename" msgstr "Переименовать" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Ожидание" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} уже существует" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "заменить" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "предложить название" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "отмена" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "заменено {new_name} на {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "отмена" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n папка" msgstr[1] "%n папки" msgstr[2] "%n папок" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n файл" msgstr[1] "%n файла" msgstr[2] "%n файлов" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Закачка %n файла" msgstr[1] "Закачка %n файлов" msgstr[2] "Закачка %n файлов" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "файлы загружаются" @@ -223,15 +223,15 @@ msgid "" "big." msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Имя" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Размер" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Изменён" @@ -308,33 +308,33 @@ msgstr "У вас нет разрешений на запись здесь." msgid "Nothing in here. Upload something!" msgstr "Здесь ничего нет. Загрузите что-нибудь!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Скачать" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Закрыть общий доступ" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Удалить" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Файл слишком велик" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Подождите, файлы сканируются." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Текущее сканирование" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 613e0555003..87d7c2b49e7 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "කණ්ඩායම" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index 5a47ffe3d4d..ea7a70653c1 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "උඩුගත කිරීම අසාර්ථකයි" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "යොමුව හිස් විය නොහැක" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "දෝෂයක්" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "නැවත නම් කරන්න" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ප්‍රතිස්ථාපනය කරන්න" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "නමක් යෝජනා කරන්න" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "අත් හරින්න" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "නිෂ්ප්‍රභ කරන්න" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "නම" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "ප්‍රමාණය" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "වෙනස් කළ" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "බාන්න" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "නොබෙදු" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "මකා දමන්න" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "උඩුගත කිරීම විශාල වැඩිය" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "වර්තමාන පරික්ෂාව" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index 0c6bbe58a8c..d1688333716 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s s Vami zdieľa »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "skupina" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 6b81e2d7efe..0ec318ec279 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Nedostatok dostupného úložného priestoru" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Odoslanie bolo neúspešné" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL nemôže byť prázdne." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Chyba" @@ -128,60 +128,60 @@ msgstr "Zmazať trvalo" msgid "Rename" msgstr "Premenovať" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Prebieha" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} už existuje" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "nahradiť" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "pomôcť s menom" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "zrušiť" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "prepísaný {new_name} súborom {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "vrátiť" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n priečinok" msgstr[1] "%n priečinky" msgstr[2] "%n priečinkov" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n súbor" msgstr[1] "%n súbory" msgstr[2] "%n súborov" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávam %n súbor" msgstr[1] "Nahrávam %n súbory" msgstr[2] "Nahrávam %n súborov" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "nahrávanie súborov" @@ -219,15 +219,15 @@ msgid "" "big." msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Názov" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Veľkosť" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Upravené" @@ -304,33 +304,33 @@ msgstr "Nemáte oprávnenie na zápis." msgid "Nothing in here. Upload something!" msgstr "Žiadny súbor. Nahrajte niečo!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Sťahovanie" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Zrušiť zdieľanie" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Zmazať" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Nahrávanie je príliš veľké" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Čakajte, súbory sú prehľadávané." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Práve prezerané" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index fa6ea1ad860..73fa71d789d 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s je delil »%s« z vami" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "skupina" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 1428fd2d734..79716d1228f 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Na voljo ni dovolj prostora" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Pošiljanje je spodletelo" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "Naslov URL ne sme biti prazna vrednost." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Napaka" @@ -128,35 +128,35 @@ msgstr "Izbriši dokončno" msgid "Rename" msgstr "Preimenuj" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "V čakanju ..." -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} že obstaja" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "zamenjaj" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "predlagaj ime" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "prekliči" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "preimenovano ime {new_name} z imenom {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "razveljavi" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -164,7 +164,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -172,11 +172,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -184,7 +184,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "poteka pošiljanje datotek" @@ -222,15 +222,15 @@ msgid "" "big." msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Ime" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Velikost" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Spremenjeno" @@ -307,33 +307,33 @@ msgstr "Za to mesto ni ustreznih dovoljenj za pisanje." msgid "Nothing in here. Upload something!" msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Prejmi" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Prekliči souporabo" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Izbriši" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Prekoračenje omejitve velikosti" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Poteka preučevanje datotek, počakajte ..." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Trenutno poteka preučevanje" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index be1b85599a1..3a92c457140 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "група" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index c5f4089097c..5e4429bcc04 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "Нема довољно простора" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Отпремање није успело" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "Адреса не може бити празна." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Грешка" @@ -127,60 +127,60 @@ msgstr "Обриши за стално" msgid "Rename" msgstr "Преименуј" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "На чекању" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} већ постоји" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "замени" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "предложи назив" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "откажи" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "замењено {new_name} са {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "опозови" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "датотеке се отпремају" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Име" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Величина" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Измењено" @@ -303,33 +303,33 @@ msgstr "Овде немате дозволу за писање." msgid "Nothing in here. Upload something!" msgstr "Овде нема ничег. Отпремите нешто!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Преузми" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Укини дељење" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Обриши" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Датотека је превелика" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеке које желите да отпремите прелазе ограничење у величини." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Скенирам датотеке…" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Тренутно скенирање" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 0147f55088e..04d23af90d9 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -28,7 +28,7 @@ msgstr "%s delade »%s« med dig" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "Grupp" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 00cbd7f1a36..2e311fca6d7 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-31 16:50+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" @@ -80,7 +80,7 @@ msgstr "Inte tillräckligt med lagringsutrymme tillgängligt" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Misslyckad uppladdning" #: ajax/upload.php:127 msgid "Invalid directory." @@ -115,7 +115,7 @@ msgstr "URL kan inte vara tom." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fel" @@ -131,57 +131,57 @@ msgstr "Radera permanent" msgid "Rename" msgstr "Byt namn" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Väntar" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} finns redan" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ersätt" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "föreslå namn" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "ersatt {new_name} med {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "ångra" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapp" msgstr[1] "%n mappar" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} och {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laddar upp %n fil" msgstr[1] "Laddar upp %n filer" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "filer laddas upp" @@ -219,15 +219,15 @@ msgid "" "big." msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Namn" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Storlek" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Ändrad" @@ -304,33 +304,33 @@ msgstr "Du saknar skrivbehörighet här." msgid "Nothing in here. Upload something!" msgstr "Ingenting här. Ladda upp något!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Ladda ner" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Sluta dela" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Radera" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "För stor uppladdning" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Filer skannas, var god vänta" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Aktuell skanning" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 71c2bdbf22d..c04debca141 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "குழு" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index 9bc657e7df4..392dfada7d8 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "பதிவேற்றல் தோல்வியுற்றது" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "URL வெறுமையாக இருக்கமுடியாத msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "வழு" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "பெயர்மாற்றம்" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "நிலுவையிலுள்ள" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} ஏற்கனவே உள்ளது" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "மாற்றிடுக" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "பெயரை பரிந்துரைக்க" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "இரத்து செய்க" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "முன் செயல் நீக்கம் " -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "பெயர்" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "அளவு" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "மாற்றப்பட்டது" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "பதிவிறக்குக" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "பகிரப்படாதது" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "நீக்குக" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "பதிவேற்றல் மிகப்பெரியது" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "தற்போது வருடப்படுபவை" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index f9ccbd0049d..f2f058e8d24 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 be393c44928..7e2f79d2672 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -112,7 +112,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "" @@ -128,57 +128,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -216,15 +216,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "" @@ -301,33 +301,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 06a88da5450..0e11e6f04d5 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 79b7984dd18..c0de53d8589 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 4cfc080a083..ba7bdaaa82e 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index ed36dd2e0d3..ca149fb14cc 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 5576a3f45bc..4c568ee555b 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 16f93542555..4d24c3c7a11 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -265,51 +265,51 @@ msgstr "" msgid "Please double check the installation guides." msgstr "" -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 33409afcebb..462831bc96f 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:33-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 32ba6b4a95d..a5d6146f1c3 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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 04f405c7392..1e53a5a759e 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\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/core.po b/l10n/th_TH/core.po index d1e093aba89..44071aa2ac3 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "กลุ่มผู้ใช้งาน" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 800c07574fa..beceaab6f50 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -76,7 +76,7 @@ msgstr "เหลือพื้นที่ไม่เพียงสำหร #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "อัพโหลดล้มเหลว" #: ajax/upload.php:127 msgid "Invalid directory." @@ -111,7 +111,7 @@ msgstr "URL ไม่สามารถเว้นว่างได้" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "ข้อผิดพลาด" @@ -127,54 +127,54 @@ msgstr "" msgid "Rename" msgstr "เปลี่ยนชื่อ" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "อยู่ระหว่างดำเนินการ" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} มีอยู่แล้วในระบบ" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "แทนที่" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "แนะนำชื่อ" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ยกเลิก" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "เลิกทำ" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "การอัพโหลดไฟล์" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "ชื่อ" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "ขนาด" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "แก้ไขแล้ว" @@ -297,33 +297,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "ดาวน์โหลด" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "ยกเลิกการแชร์" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "ลบ" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index ad793be7d81..3f86937276e 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -26,7 +26,7 @@ msgstr "%s sizinle »%s« paylaşımında bulundu" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index ec4947bf1e3..5fe275702b0 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "Yeterli disk alanı yok" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Yükleme başarısız" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "URL boş olamaz." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir." -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Hata" @@ -130,57 +130,57 @@ msgstr "Kalıcı olarak sil" msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Bekliyor" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "değiştir" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "Öneri ad" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "iptal" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ismi {old_name} ile değiştirildi" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "geri al" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dizin" msgstr[1] "%n dizin" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n dosya" msgstr[1] "%n dosya" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n dosya yükleniyor" msgstr[1] "%n dosya yükleniyor" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "Dosyalar yükleniyor" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "İsim" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Boyut" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Değiştirilme" @@ -303,33 +303,33 @@ msgstr "Buraya erişim hakkınız yok." msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "İndir" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Paylaşılmayan" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Sil" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Yükleme çok büyük" -#: templates/index.php:107 +#: templates/index.php:110 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:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index e4e9c2bb89e..307adf55903 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "گۇرۇپپا" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 5626dcfa66f..9467404002f 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -24,7 +24,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "група" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index b862958c94f..cd61a53093e 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Місця більше немає" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Помилка завантаження" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL не може бути пустим." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Помилка" @@ -128,60 +128,60 @@ msgstr "Видалити назавжди" msgid "Rename" msgstr "Перейменувати" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Очікування" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} вже існує" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "заміна" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "запропонуйте назву" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "відміна" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "замінено {new_name} на {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "відмінити" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "файли завантажуються" @@ -219,15 +219,15 @@ msgid "" "big." msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Ім'я" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Розмір" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Змінено" @@ -304,33 +304,33 @@ msgstr "У вас тут немає прав на запис." msgid "Nothing in here. Upload something!" msgstr "Тут нічого немає. Відвантажте що-небудь!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Завантажити" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Закрити доступ" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Видалити" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Файл занадто великий" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Файли скануються, зачекайте, будь-ласка." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Поточне сканування" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index d7196f3ab9f..dda5098f3cb 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -25,7 +25,7 @@ msgstr "" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "nhóm" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index 3d1f24debd6..bba27b3142c 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -77,7 +77,7 @@ msgstr "Không đủ không gian lưu trữ" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Tải lên thất bại" #: ajax/upload.php:127 msgid "Invalid directory." @@ -112,7 +112,7 @@ msgstr "URL không được để trống." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Lỗi" @@ -128,54 +128,54 @@ msgstr "Xóa vĩnh vễn" msgid "Rename" msgstr "Sửa tên" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Đang chờ" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} đã tồn tại" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "thay thế" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "tên gợi ý" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "hủy" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "đã thay thế {new_name} bằng {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "lùi lại" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "tệp tin đang được tải lên" @@ -213,15 +213,15 @@ msgid "" "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Tên" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Kích cỡ" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Thay đổi" @@ -298,33 +298,33 @@ msgstr "Bạn không có quyền ghi vào đây." msgid "Nothing in here. Upload something!" msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Tải về" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Bỏ chia sẻ" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Xóa" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Tập tin tải lên quá lớn" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Tập tin đang được quét ,vui lòng chờ." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Hiện tại đang quét" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index d05019be94c..450b3755876 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -27,7 +27,7 @@ msgstr "%s 向您分享了 »%s«" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "组" #: ajax/update.php:11 msgid "Turned on maintenance mode" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index fe65471744c..a61fb2a34d3 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-08-30 13:50+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" @@ -79,7 +79,7 @@ msgstr "没有足够的存储空间" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "上传失败" #: ajax/upload.php:127 msgid "Invalid directory." @@ -114,7 +114,7 @@ msgstr "URL不能为空" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "错误" @@ -130,54 +130,54 @@ msgstr "永久删除" msgid "Rename" msgstr "重命名" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "等待" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} 已存在" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "替换" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "建议名称" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "取消" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "已将 {old_name}替换成 {new_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "撤销" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 文件夹" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n个文件" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "文件上传中" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "下载正在准备中。如果文件较大可能会花费一些时间。" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "名称" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "大小" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "修改日期" @@ -300,33 +300,33 @@ msgstr "您没有写权限" msgid "Nothing in here. Upload something!" msgstr "这里还什么都没有。上传些东西吧！" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "下载" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "取消共享" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "删除" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "上传文件过大" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "文件正在被扫描，请稍候。" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "当前扫描" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 52d6f701174..2a689d6fc8f 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 13:10+0000\n" +"Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,32 +26,32 @@ msgstr "%s 與您分享了 %s" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "群組" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "已啓用維護模式" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "已停用維護模式" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "已更新資料庫" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "更新檔案快取，這可能要很久…" #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "已更新檔案快取" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "已完成 %d%%" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -64,13 +64,13 @@ msgstr "沒有可增加的分類？" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "分類已經存在： %s" +msgstr "分類已經存在：%s" #: 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 @@ -291,7 +291,7 @@ msgstr "{owner} 已經和您分享" #: js/share.js:183 msgid "Share with" -msgstr "與...分享" +msgstr "分享給別人" #: js/share.js:188 msgid "Share with link" @@ -319,7 +319,7 @@ msgstr "寄出" #: js/share.js:208 msgid "Set expiration date" -msgstr "設置到期日" +msgstr "指定到期日" #: js/share.js:209 msgid "Expiration date" @@ -343,7 +343,7 @@ msgstr "已和 {user} 分享 {item}" #: js/share.js:338 msgid "Unshare" -msgstr "取消共享" +msgstr "取消分享" #: js/share.js:350 msgid "can edit" @@ -375,15 +375,15 @@ msgstr "受密碼保護" #: js/share.js:643 msgid "Error unsetting expiration date" -msgstr "解除過期日設定失敗" +msgstr "取消到期日設定失敗" #: js/share.js:655 msgid "Error setting expiration date" -msgstr "錯誤的到期日設定" +msgstr "設定到期日發生錯誤" #: js/share.js:670 msgid "Sending ..." -msgstr "正在傳送..." +msgstr "正在傳送…" #: js/share.js:681 msgid "Email sent" @@ -414,7 +414,7 @@ msgid "" "The link to reset your password has been sent to your email.
      If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.
      If it is not there ask your local administrator ." -msgstr "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。" +msgstr "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。" #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!
      Did you make sure your email/username was right?" @@ -487,7 +487,7 @@ msgstr "存取被拒" #: templates/404.php:15 msgid "Cloud not found" -msgstr "未發現雲端" +msgstr "找不到網頁" #: templates/altmail.php:2 #, php-format @@ -498,7 +498,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s" +msgstr "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -557,7 +557,7 @@ msgstr "進階" #: templates/installation.php:67 msgid "Data folder" -msgstr "資料夾" +msgstr "資料儲存位置" #: templates/installation.php:77 msgid "Configure the database" @@ -630,16 +630,16 @@ msgstr "登入" #: templates/login.php:45 msgid "Alternative Logins" -msgstr "替代登入方法" +msgstr "其他登入方法" #: templates/mail.php:15 #, php-format msgid "" "Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" -msgstr "嗨，

      通知您，%s 與您分享了 %s ，
      看一下吧" +msgstr "嗨，

      通知您一聲，%s 與您分享了 %s ，
      看一下吧" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。" +msgstr "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index ffc68f12388..260d80d6bf5 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 13:20+0000\n" +"Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "無法移動 %s - 同名的檔案已經存在" +msgstr "無法移動 %s ，同名的檔案已經存在" #: ajax/move.php:27 ajax/move.php:30 #, php-format @@ -30,7 +30,7 @@ msgstr "無法移動 %s" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "無法設定上傳目錄。" +msgstr "無法設定上傳目錄" #: ajax/upload.php:22 msgid "Invalid Token" @@ -38,11 +38,11 @@ msgstr "無效的 token" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" -msgstr "沒有檔案被上傳。未知的錯誤。" +msgstr "沒有檔案被上傳，原因未知" #: ajax/upload.php:66 msgid "There is no error, the file uploaded with success" -msgstr "無錯誤，檔案上傳成功" +msgstr "一切都順利，檔案上傳成功" #: ajax/upload.php:67 msgid "" @@ -77,11 +77,11 @@ msgstr "儲存空間不足" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "上傳失敗" #: ajax/upload.php:127 msgid "Invalid directory." -msgstr "無效的資料夾。" +msgstr "無效的資料夾" #: appinfo/app.php:12 msgid "Files" @@ -89,7 +89,7 @@ msgstr "檔案" #: js/file-upload.js:11 msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0" +msgstr "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0" #: js/file-upload.js:24 msgid "Not enough space available" @@ -102,17 +102,17 @@ msgstr "上傳已取消" #: js/file-upload.js:165 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "檔案上傳中。離開此頁面將會取消上傳。" +msgstr "檔案上傳中，離開此頁面將會取消上傳。" #: js/file-upload.js:239 msgid "URL cannot be empty." -msgstr "URL 不能為空白。" +msgstr "URL 不能為空" #: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "錯誤" @@ -128,70 +128,70 @@ msgstr "永久刪除" msgid "Rename" msgstr "重新命名" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "等候中" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} 已經存在" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "取代" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "建議檔名" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "取消" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "使用 {new_name} 取代 {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "復原" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 個資料夾" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n 個檔案" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} 和 {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個檔案正在上傳" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" -msgstr "檔案正在上傳中" +msgstr "檔案上傳中" #: js/files.js:52 msgid "'.' is an invalid file name." -msgstr "'.' 是不合法的檔名。" +msgstr "'.' 是不合法的檔名" #: js/files.js:56 msgid "File name cannot be empty." -msgstr "檔名不能為空。" +msgstr "檔名不能為空" #: js/files.js:64 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。" +msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元" #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" @@ -213,17 +213,17 @@ msgid "" "big." msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "名稱" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "大小" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" -msgstr "修改" +msgstr "修改時間" #: lib/app.php:73 #, php-format @@ -240,7 +240,7 @@ msgstr "檔案處理" #: templates/admin.php:7 msgid "Maximum upload size" -msgstr "最大上傳檔案大小" +msgstr "上傳限制" #: templates/admin.php:10 msgid "max. possible: " @@ -248,11 +248,11 @@ msgstr "最大允許：" #: templates/admin.php:15 msgid "Needed for multi-file and folder downloads." -msgstr "針對多檔案和目錄下載是必填的。" +msgstr "下載多檔案和目錄時，此項是必填的。" #: templates/admin.php:17 msgid "Enable ZIP-download" -msgstr "啟用 Zip 下載" +msgstr "啟用 ZIP 下載" #: templates/admin.php:20 msgid "0 is unlimited" @@ -260,7 +260,7 @@ msgstr "0代表沒有限制" #: templates/admin.php:22 msgid "Maximum input size for ZIP files" -msgstr "針對 ZIP 檔案最大輸入大小" +msgstr "ZIP 壓縮前的原始大小限制" #: templates/admin.php:26 msgid "Save" @@ -284,7 +284,7 @@ msgstr "從連結" #: templates/index.php:41 msgid "Deleted files" -msgstr "已刪除的檔案" +msgstr "回收桶" #: templates/index.php:46 msgid "Cancel upload" @@ -292,42 +292,42 @@ msgstr "取消上傳" #: templates/index.php:52 msgid "You don’t have write permissions here." -msgstr "您在這裡沒有編輯權。" +msgstr "您在這裡沒有編輯權" #: templates/index.php:59 msgid "Nothing in here. Upload something!" -msgstr "這裡什麼也沒有，上傳一些東西吧！" +msgstr "這裡還沒有東西，上傳一些吧！" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "下載" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" -msgstr "取消共享" +msgstr "取消分享" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "刪除" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "上傳過大" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。" +msgstr "您試圖上傳的檔案大小超過伺服器的限制。" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "正在掃描檔案，請稍等。" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" -msgstr "目前掃描" +msgstr "正在掃描" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "正在升級檔案系統快取..." +msgstr "正在升級檔案系統快取…" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index 37faace2e6e..59f0e459f57 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 04:20+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 13:20+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #: templates/authenticate.php:4 msgid "The password is wrong. Try again." -msgstr "請檢查您的密碼並再試一次。" +msgstr "請檢查您的密碼並再試一次" #: templates/authenticate.php:7 msgid "Password" @@ -32,7 +32,7 @@ msgstr "送出" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "抱歉，這連結看來已經不能用了。" +msgstr "抱歉，此連結已經失效" #: templates/part.404.php:4 msgid "Reasons might be:" @@ -64,7 +64,7 @@ msgstr "%s 和您分享了資料夾 %s " msgid "%s shared the file %s with you" msgstr "%s 和您分享了檔案 %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "下載" @@ -76,6 +76,6 @@ msgstr "上傳" msgid "Cancel upload" msgstr "取消上傳" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "無法預覽" diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po index 53c5a7baec1..57f79d287d9 100644 --- a/l10n/zh_TW/files_trashbin.po +++ b/l10n/zh_TW/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 04:00+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 13:20+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -28,47 +28,47 @@ msgstr "無法永久刪除 %s" msgid "Couldn't restore %s" msgstr "無法還原 %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "進行還原動作" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "錯誤" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "永久刪除檔案" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "永久刪除" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "名稱" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "已刪除" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 個資料夾" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n 個檔案" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "已還原" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "您的垃圾桶是空的！" +msgstr "您的回收桶是空的！" #: templates/index.php:20 templates/index.php:22 msgid "Restore" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 9ba8be581ba..5bda63d03bd 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 04:10+0000\n" +"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"PO-Revision-Date: 2013-09-01 14:00+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -85,47 +85,47 @@ msgstr "使用者移出群組 %s 錯誤" msgid "Couldn't update app." msgstr "無法更新應用程式" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "更新至 {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "停用" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "啟用" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "請稍候..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "停用應用程式錯誤" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "啓用應用程式錯誤" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "更新中..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "更新應用程式錯誤" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "錯誤" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "更新" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "已更新" @@ -356,7 +356,7 @@ msgid "" "licensed under the AGPL." -msgstr "由 ownCloud 社群開發，原始碼在 AGPL 許可證下發布。" +msgstr "由 ownCloud 社群開發，原始碼在 AGPL 授權許可下發布。" #: templates/apps.php:13 msgid "Add your App" @@ -472,7 +472,7 @@ msgstr "WebDAV" msgid "" "Use this address to access your Files via WebDAV" -msgstr "使用這個網址來透過 WebDAV 存取您的檔案" +msgstr "以上的 WebDAV 位址可以讓您透過 WebDAV 協定存取檔案" #: templates/personal.php:117 msgid "Encryption" diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 14bbf6f6a13..7a82f8f6a19 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -1,5 +1,7 @@ "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud", +"No app name specified" => "No se ha especificado nombre de la aplicación", "Help" => "Ayuda", "Personal" => "Personal", "Settings" => "Ajustes", @@ -13,6 +15,15 @@ $TRANSLATIONS = array( "Back to Files" => "Volver a Archivos", "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.", +"No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación", +"No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación", +"No path specified when installing app from local file" => "Sin path especificado cuando se ha instalado la aplicación desde el fichero local", +"Archives of type %s are not supported" => "Ficheros de tipo %s no son soportados", +"Failed to open archive when installing app" => "Fallo de apertura de fichero mientras se instala la aplicación", +"App does not provide an info.xml file" => "La aplicación no suministra un fichero info.xml", +"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación", +"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n\ntrue\n\nque no está permitida para aplicaciones no distribuidas", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error de autenticación", "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index a35027eb962..c3a040048ec 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -23,6 +23,7 @@ $TRANSLATIONS = array( "App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml", "App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno", "App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag true che non è permesso alle applicazioni non shipped", "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store", "App directory already exists" => "La cartella dell'applicazione esiste già", "Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s", diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php index 902170524b9..e2b67e76187 100644 --- a/lib/l10n/ja_JP.php +++ b/lib/l10n/ja_JP.php @@ -1,5 +1,7 @@ " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。", +"No app name specified" => "アプリ名が未指定", "Help" => "ヘルプ", "Personal" => "個人", "Settings" => "設定", @@ -13,6 +15,17 @@ $TRANSLATIONS = array( "Back to Files" => "ファイルに戻る", "Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。", +"No source specified when installing app" => "アプリインストール時のソースが未指定", +"No href specified when installing app from http" => "アプリインストール時のhttpの URL が未指定", +"No path specified when installing app from local file" => "アプリインストール時のローカルファイルのパスが未指定", +"Archives of type %s are not supported" => "\"%s\"タイプのアーカイブ形式は未サポート", +"Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。", +"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません", +"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません", +"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません", +"App directory already exists" => "アプリディレクトリは既に存在します", +"Can't create app folder. Please fix permissions. %s" => "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。", "Application is not enabled" => "アプリケーションは無効です", "Authentication error" => "認証エラー", "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 0fda1309395..29594a95dcf 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "Disabilita", "Enable" => "Abilita", "Please wait...." => "Attendere...", +"Error while disabling app" => "Errore durante la disattivazione", +"Error while enabling app" => "Errore durante l'attivazione", "Updating...." => "Aggiornamento in corso...", "Error while updating app" => "Errore durante l'aggiornamento", "Error" => "Errore", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 8bbdc222e43..63e83cab4dd 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -20,6 +20,8 @@ $TRANSLATIONS = array( "Disable" => "無効", "Enable" => "有効化", "Please wait...." => "しばらくお待ちください。", +"Error while disabling app" => "アプリ無効化中にエラーが発生", +"Error while enabling app" => "アプリ有効化中にエラーが発生", "Updating...." => "更新中....", "Error while updating app" => "アプリの更新中にエラーが発生", "Error" => "エラー", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index d72bca799dd..e1299bb9649 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Por favor aguarde...", +"Error while disabling app" => "Erro enquanto desactivava a aplicação", +"Error while enabling app" => "Erro enquanto activava a aplicação", "Updating...." => "A Actualizar...", "Error while updating app" => "Erro enquanto actualizava a aplicação", "Error" => "Erro", "Update" => "Actualizar", "Updated" => "Actualizado", +"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.", "Saving..." => "A guardar...", "deleted" => "apagado", "undo" => "desfazer", @@ -102,6 +105,9 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Use este endereço para aceder aos seus ficheiros via WebDav", "Encryption" => "Encriptação", +"The encryption app is no longer enabled, decrypt all your file" => "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro", +"Log-in password" => "Password de entrada", +"Decrypt all Files" => "Desencriptar todos os ficheiros", "Login Name" => "Nome de utilizador", "Create" => "Criar", "Admin Recovery Password" => "Recuperar password de administrador", diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index 5cd3679751b..73c015d17af 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -75,7 +75,7 @@ $TRANSLATIONS = array( "More" => "更多", "Less" => "更少", "Version" => "版本", -"Developed by the ownCloud community, the source code is licensed under the AGPL." => "由 ownCloud 社群開發，原始碼在 AGPL 許可證下發布。", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "由 ownCloud 社群開發，原始碼在 AGPL 授權許可下發布。", "Add your App" => "添加你的 App", "More Apps" => "更多Apps", "Select an App" => "選擇一個應用程式", @@ -103,7 +103,7 @@ $TRANSLATIONS = array( "Language" => "語言", "Help translate" => "幫助翻譯", "WebDAV" => "WebDAV", -"Use this address to access your Files via WebDAV" => "使用這個網址來透過 WebDAV 存取您的檔案", +"Use this address to access your Files via WebDAV" => "以上的 WebDAV 位址可以讓您透過 WebDAV 協定存取檔案", "Encryption" => "加密", "The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案", "Log-in password" => "登入密碼", -- cgit v1.2.3 From a22f9ff301312bb24332edaacfb65c280cd8fcd8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 1 Sep 2013 19:47:48 +0200 Subject: Provide an implementation of the fileapi for oc6 build on top of the old api --- lib/files/exceptions.php | 21 ++ lib/files/node/file.php | 155 ++++++++ lib/files/node/folder.php | 382 ++++++++++++++++++++ lib/files/node/node.php | 247 +++++++++++++ lib/files/node/nonexistingfile.php | 89 +++++ lib/files/node/nonexistingfolder.php | 113 ++++++ lib/files/node/root.php | 337 ++++++++++++++++++ lib/files/view.php | 2 +- tests/lib/files/node/file.php | 664 +++++++++++++++++++++++++++++++++++ tests/lib/files/node/folder.php | 479 +++++++++++++++++++++++++ tests/lib/files/node/integration.php | 121 +++++++ tests/lib/files/node/node.php | 330 +++++++++++++++++ tests/lib/files/node/root.php | 106 ++++++ 13 files changed, 3045 insertions(+), 1 deletion(-) create mode 100644 lib/files/exceptions.php create mode 100644 lib/files/node/file.php create mode 100644 lib/files/node/folder.php create mode 100644 lib/files/node/node.php create mode 100644 lib/files/node/nonexistingfile.php create mode 100644 lib/files/node/nonexistingfolder.php create mode 100644 lib/files/node/root.php create mode 100644 tests/lib/files/node/file.php create mode 100644 tests/lib/files/node/folder.php create mode 100644 tests/lib/files/node/integration.php create mode 100644 tests/lib/files/node/node.php create mode 100644 tests/lib/files/node/root.php (limited to 'lib') diff --git a/lib/files/exceptions.php b/lib/files/exceptions.php new file mode 100644 index 00000000000..8a3c40ab0c0 --- /dev/null +++ b/lib/files/exceptions.php @@ -0,0 +1,21 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files; + +class NotFoundException extends \Exception { +} + +class NotPermittedException extends \Exception { +} + +class AlreadyExistsException extends \Exception { +} + +class NotEnoughSpaceException extends \Exception { +} diff --git a/lib/files/node/file.php b/lib/files/node/file.php new file mode 100644 index 00000000000..0ad5d68ec66 --- /dev/null +++ b/lib/files/node/file.php @@ -0,0 +1,155 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\NotPermittedException; + +class File extends Node { + /** + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getContent() { + if ($this->checkPermissions(\OCP\PERMISSION_READ)) { + /** + * @var \OC\Files\Storage\Storage $storage; + */ + return $this->view->file_get_contents($this->path); + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $data + * @throws \OC\Files\NotPermittedException + */ + public function putContent($data) { + if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) { + $this->sendHooks(array('preWrite')); + $this->view->file_put_contents($this->path, $data); + $this->sendHooks(array('postWrite')); + } else { + throw new NotPermittedException(); + } + } + + /** + * @return string + */ + public function getMimeType() { + return $this->view->getMimeType($this->path); + } + + /** + * @param string $mode + * @return resource + * @throws \OC\Files\NotPermittedException + */ + public function fopen($mode) { + $preHooks = array(); + $postHooks = array(); + $requiredPermissions = \OCP\PERMISSION_READ; + switch ($mode) { + case 'r+': + case 'rb+': + case 'w+': + case 'wb+': + case 'x+': + case 'xb+': + case 'a+': + case 'ab+': + case 'w': + case 'wb': + case 'x': + case 'xb': + case 'a': + case 'ab': + $preHooks[] = 'preWrite'; + $postHooks[] = 'postWrite'; + $requiredPermissions |= \OCP\PERMISSION_UPDATE; + break; + } + + if ($this->checkPermissions($requiredPermissions)) { + $this->sendHooks($preHooks); + $result = $this->view->fopen($this->path, $mode); + $this->sendHooks($postHooks); + return $result; + } else { + throw new NotPermittedException(); + } + } + + public function delete() { + if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) { + $this->sendHooks(array('preDelete')); + $this->view->unlink($this->path); + $nonExisting = new NonExistingFile($this->root, $this->view, $this->path); + $this->root->emit('\OC\Files', 'postDelete', array($nonExisting)); + $this->exists = false; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function copy($targetPath) { + $targetPath = $this->normalizePath($targetPath); + $parent = $this->root->get(dirname($targetPath)); + if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) { + $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath); + $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting)); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->view->copy($this->path, $targetPath); + $targetNode = $this->root->get($targetPath); + $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode)); + $this->root->emit('\OC\Files', 'postWrite', array($targetNode)); + return $targetNode; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function move($targetPath) { + $targetPath = $this->normalizePath($targetPath); + $parent = $this->root->get(dirname($targetPath)); + if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) { + $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath); + $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting)); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->view->rename($this->path, $targetPath); + $targetNode = $this->root->get($targetPath); + $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode)); + $this->root->emit('\OC\Files', 'postWrite', array($targetNode)); + $this->path = $targetPath; + return $targetNode; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $type + * @param bool $raw + * @return string + */ + public function hash($type, $raw = false) { + return $this->view->hash($type, $this->path, $raw); + } +} diff --git a/lib/files/node/folder.php b/lib/files/node/folder.php new file mode 100644 index 00000000000..f710ae5ae9a --- /dev/null +++ b/lib/files/node/folder.php @@ -0,0 +1,382 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Cache\Scanner; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; + +class Folder extends Node { + /** + * @param string $path path relative to the folder + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getFullPath($path) { + if (!$this->isValidPath($path)) { + throw new NotPermittedException(); + } + return $this->path . $this->normalizePath($path); + } + + /** + * @param string $path + * @throws \OC\Files\NotFoundException + * @return string + */ + public function getRelativePath($path) { + if ($this->path === '' or $this->path === '/') { + return $this->normalizePath($path); + } + if (strpos($path, $this->path) !== 0) { + throw new NotFoundException(); + } else { + $path = substr($path, strlen($this->path)); + if (strlen($path) === 0) { + return '/'; + } else { + return $this->normalizePath($path); + } + } + } + + /** + * check if a node is a (grand-)child of the folder + * + * @param \OC\Files\Node\Node $node + * @return bool + */ + public function isSubNode($node) { + return strpos($node->getPath(), $this->path . '/') === 0; + } + + /** + * get the content of this directory + * + * @throws \OC\Files\NotFoundException + * @return Node[] + */ + public function getDirectoryListing() { + $result = array(); + + /** + * @var \OC\Files\Storage\Storage $storage + */ + list($storage, $internalPath) = $this->view->resolvePath($this->path); + if ($storage) { + $cache = $storage->getCache($internalPath); + $permissionsCache = $storage->getPermissionsCache($internalPath); + + //trigger cache update check + $this->view->getFileInfo($this->path); + + $files = $cache->getFolderContents($internalPath); + $permissions = $permissionsCache->getDirectoryPermissions($this->getId(), $this->root->getUser()->getUID()); + } else { + $files = array(); + } + + //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders + $mounts = $this->root->getMountsIn($this->path); + $dirLength = strlen($this->path); + foreach ($mounts as $mount) { + $subStorage = $mount->getStorage(); + if ($subStorage) { + $subCache = $subStorage->getCache(''); + + if ($subCache->getStatus('') === Cache::NOT_FOUND) { + $subScanner = $subStorage->getScanner(''); + $subScanner->scanFile(''); + } + + $rootEntry = $subCache->get(''); + if ($rootEntry) { + $relativePath = trim(substr($mount->getMountPoint(), $dirLength), '/'); + if ($pos = strpos($relativePath, '/')) { + //mountpoint inside subfolder add size to the correct folder + $entryName = substr($relativePath, 0, $pos); + foreach ($files as &$entry) { + if ($entry['name'] === $entryName) { + if ($rootEntry['size'] >= 0) { + $entry['size'] += $rootEntry['size']; + } else { + $entry['size'] = -1; + } + } + } + } else { //mountpoint in this folder, add an entry for it + $rootEntry['name'] = $relativePath; + $rootEntry['storageObject'] = $subStorage; + + //remove any existing entry with the same name + foreach ($files as $i => $file) { + if ($file['name'] === $rootEntry['name']) { + $files[$i] = null; + break; + } + } + $files[] = $rootEntry; + } + } + } + } + + foreach ($files as $file) { + if ($file) { + if (isset($permissions[$file['fileid']])) { + $file['permissions'] = $permissions[$file['fileid']]; + } + $node = $this->createNode($this->path . '/' . $file['name'], $file); + $result[] = $node; + } + } + + return $result; + } + + /** + * @param string $path + * @param array $info + * @return File|Folder + */ + protected function createNode($path, $info = array()) { + if (!isset($info['mimetype'])) { + $isDir = $this->view->is_dir($path); + } else { + $isDir = $info['mimetype'] === 'httpd/unix-directory'; + } + if ($isDir) { + return new Folder($this->root, $this->view, $path); + } else { + return new File($this->root, $this->view, $path); + } + } + + /** + * Get the node at $path + * + * @param string $path + * @return \OC\Files\Node\Node + * @throws \OC\Files\NotFoundException + */ + public function get($path) { + return $this->root->get($this->getFullPath($path)); + } + + /** + * @param string $path + * @return bool + */ + public function nodeExists($path) { + try { + $this->get($path); + return true; + } catch (NotFoundException $e) { + return false; + } + } + + /** + * @param string $path + * @return Folder + * @throws NotPermittedException + */ + public function newFolder($path) { + if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) { + $fullPath = $this->getFullPath($path); + $nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->root->emit('\OC\Files', 'preCreate', array($nonExisting)); + $this->view->mkdir($fullPath); + $node = new Folder($this->root, $this->view, $fullPath); + $this->root->emit('\OC\Files', 'postWrite', array($node)); + $this->root->emit('\OC\Files', 'postCreate', array($node)); + return $node; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $path + * @return File + * @throws NotPermittedException + */ + public function newFile($path) { + if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) { + $fullPath = $this->getFullPath($path); + $nonExisting = new NonExistingFile($this->root, $this->view, $fullPath); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->root->emit('\OC\Files', 'preCreate', array($nonExisting)); + $this->view->touch($fullPath); + $node = new File($this->root, $this->view, $fullPath); + $this->root->emit('\OC\Files', 'postWrite', array($node)); + $this->root->emit('\OC\Files', 'postCreate', array($node)); + return $node; + } else { + throw new NotPermittedException(); + } + } + + /** + * search for files with the name matching $query + * + * @param string $query + * @return Node[] + */ + public function search($query) { + return $this->searchCommon('%' . $query . '%', 'search'); + } + + /** + * search for files by mimetype + * + * @param string $mimetype + * @return Node[] + */ + public function searchByMime($mimetype) { + return $this->searchCommon($mimetype, 'searchByMime'); + } + + /** + * @param string $query + * @param string $method + * @return Node[] + */ + private function searchCommon($query, $method) { + $files = array(); + $rootLength = strlen($this->path); + /** + * @var \OC\Files\Storage\Storage $storage + */ + list($storage, $internalPath) = $this->view->resolvePath($this->path); + $internalRootLength = strlen($internalPath); + + $cache = $storage->getCache(''); + + $results = $cache->$method($query); + foreach ($results as $result) { + if ($internalRootLength === 0 or substr($result['path'], 0, $internalRootLength) === $internalPath) { + $result['internalPath'] = $result['path']; + $result['path'] = substr($result['path'], $internalRootLength); + $result['storage'] = $storage; + $files[] = $result; + } + } + + $mounts = $this->root->getMountsIn($this->path); + foreach ($mounts as $mount) { + $storage = $mount->getStorage(); + if ($storage) { + $cache = $storage->getCache(''); + + $relativeMountPoint = substr($mount->getMountPoint(), $rootLength); + $results = $cache->$method($query); + foreach ($results as $result) { + $result['internalPath'] = $result['path']; + $result['path'] = $relativeMountPoint . $result['path']; + $result['storage'] = $storage; + $files[] = $result; + } + } + } + + $result = array(); + foreach ($files as $file) { + $result[] = $this->createNode($this->normalizePath($this->path . '/' . $file['path']), $file); + } + + return $result; + } + + /** + * @param $id + * @return Node[] + */ + public function getById($id) { + $nodes = $this->root->getById($id); + $result = array(); + foreach ($nodes as $node) { + $pathPart = substr($node->getPath(), 0, strlen($this->getPath()) + 1); + if ($this->path === '/' or $pathPart === $this->getPath() . '/') { + $result[] = $node; + } + } + return $result; + } + + public function getFreeSpace() { + return $this->view->free_space($this->path); + } + + /** + * @return bool + */ + public function isCreatable() { + return $this->checkPermissions(\OCP\PERMISSION_CREATE); + } + + public function delete() { + if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) { + $this->sendHooks(array('preDelete')); + $this->view->rmdir($this->path); + $nonExisting = new NonExistingFolder($this->root, $this->view, $this->path); + $this->root->emit('\OC\Files', 'postDelete', array($nonExisting)); + $this->exists = false; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function copy($targetPath) { + $targetPath = $this->normalizePath($targetPath); + $parent = $this->root->get(dirname($targetPath)); + if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) { + $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath); + $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting)); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->view->copy($this->path, $targetPath); + $targetNode = $this->root->get($targetPath); + $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode)); + $this->root->emit('\OC\Files', 'postWrite', array($targetNode)); + return $targetNode; + } else { + throw new NotPermittedException(); + } + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function move($targetPath) { + $targetPath = $this->normalizePath($targetPath); + $parent = $this->root->get(dirname($targetPath)); + if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) { + $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath); + $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting)); + $this->root->emit('\OC\Files', 'preWrite', array($nonExisting)); + $this->view->rename($this->path, $targetPath); + $targetNode = $this->root->get($targetPath); + $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode)); + $this->root->emit('\OC\Files', 'postWrite', array($targetNode)); + $this->path = $targetPath; + return $targetNode; + } else { + throw new NotPermittedException(); + } + } +} diff --git a/lib/files/node/node.php b/lib/files/node/node.php new file mode 100644 index 00000000000..a71f7875064 --- /dev/null +++ b/lib/files/node/node.php @@ -0,0 +1,247 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Cache\Scanner; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; + +require_once 'files/exceptions.php'; + +class Node { + /** + * @var \OC\Files\View $view + */ + protected $view; + + /** + * @var \OC\Files\Node\Root $root + */ + protected $root; + + /** + * @var string $path + */ + protected $path; + + /** + * @param \OC\Files\View $view + * @param \OC\Files\Node\Root Root $root + * @param string $path + */ + public function __construct($root, $view, $path) { + $this->view = $view; + $this->root = $root; + $this->path = $path; + } + + /** + * @param string[] $hooks + */ + protected function sendHooks($hooks) { + foreach ($hooks as $hook) { + $this->root->emit('\OC\Files', $hook, array($this)); + } + } + + /** + * @param int $permissions + * @return bool + */ + protected function checkPermissions($permissions) { + return ($this->getPermissions() & $permissions) == $permissions; + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function move($targetPath) { + return; + } + + public function delete() { + return; + } + + /** + * @param string $targetPath + * @return \OC\Files\Node\Node + */ + public function copy($targetPath) { + return; + } + + /** + * @param int $mtime + * @throws \OC\Files\NotPermittedException + */ + public function touch($mtime = null) { + if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) { + $this->sendHooks(array('preTouch')); + $this->view->touch($this->path, $mtime); + $this->sendHooks(array('postTouch')); + } else { + throw new NotPermittedException(); + } + } + + /** + * @return \OC\Files\Storage\Storage + * @throws \OC\Files\NotFoundException + */ + public function getStorage() { + list($storage,) = $this->view->resolvePath($this->path); + return $storage; + } + + /** + * @return string + */ + public function getPath() { + return $this->path; + } + + /** + * @return string + */ + public function getInternalPath() { + list(, $internalPath) = $this->view->resolvePath($this->path); + return $internalPath; + } + + /** + * @return int + */ + public function getId() { + $info = $this->view->getFileInfo($this->path); + return $info['fileid']; + } + + /** + * @return array + */ + public function stat() { + return $this->view->stat($this->path); + } + + /** + * @return int + */ + public function getMTime() { + return $this->view->filemtime($this->path); + } + + /** + * @return int + */ + public function getSize() { + return $this->view->filesize($this->path); + } + + /** + * @return string + */ + public function getEtag() { + $info = $this->view->getFileInfo($this->path); + return $info['etag']; + } + + /** + * @return int + */ + public function getPermissions() { + $info = $this->view->getFileInfo($this->path); + return $info['permissions']; + } + + /** + * @return bool + */ + public function isReadable() { + return $this->checkPermissions(\OCP\PERMISSION_READ); + } + + /** + * @return bool + */ + public function isUpdateable() { + return $this->checkPermissions(\OCP\PERMISSION_UPDATE); + } + + /** + * @return bool + */ + public function isDeletable() { + return $this->checkPermissions(\OCP\PERMISSION_DELETE); + } + + /** + * @return bool + */ + public function isShareable() { + return $this->checkPermissions(\OCP\PERMISSION_SHARE); + } + + /** + * @return Node + */ + public function getParent() { + return $this->root->get(dirname($this->path)); + } + + /** + * @return string + */ + public function getName() { + return basename($this->path); + } + + /** + * @param string $path + * @return string + */ + protected function normalizePath($path) { + if ($path === '' or $path === '/') { + return '/'; + } + //no windows style slashes + $path = str_replace('\\', '/', $path); + //add leading slash + if ($path[0] !== '/') { + $path = '/' . $path; + } + //remove duplicate slashes + while (strpos($path, '//') !== false) { + $path = str_replace('//', '/', $path); + } + //remove trailing slash + $path = rtrim($path, '/'); + + return $path; + } + + /** + * check if the requested path is valid + * + * @param string $path + * @return bool + */ + public function isValidPath($path) { + if (!$path || $path[0] !== '/') { + $path = '/' . $path; + } + if (strstr($path, '/../') || strrchr($path, '/') === '/..') { + return false; + } + return true; + } +} diff --git a/lib/files/node/nonexistingfile.php b/lib/files/node/nonexistingfile.php new file mode 100644 index 00000000000..6f18450efee --- /dev/null +++ b/lib/files/node/nonexistingfile.php @@ -0,0 +1,89 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\NotFoundException; + +class NonExistingFile extends File { + /** + * @param string $newPath + * @throws \OC\Files\NotFoundException + */ + public function rename($newPath) { + throw new NotFoundException(); + } + + public function delete() { + throw new NotFoundException(); + } + + public function copy($newPath) { + throw new NotFoundException(); + } + + public function touch($mtime = null) { + throw new NotFoundException(); + } + + public function getId() { + throw new NotFoundException(); + } + + public function stat() { + throw new NotFoundException(); + } + + public function getMTime() { + throw new NotFoundException(); + } + + public function getSize() { + throw new NotFoundException(); + } + + public function getEtag() { + throw new NotFoundException(); + } + + public function getPermissions() { + throw new NotFoundException(); + } + + public function isReadable() { + throw new NotFoundException(); + } + + public function isUpdateable() { + throw new NotFoundException(); + } + + public function isDeletable() { + throw new NotFoundException(); + } + + public function isShareable() { + throw new NotFoundException(); + } + + public function getContent() { + throw new NotFoundException(); + } + + public function putContent($data) { + throw new NotFoundException(); + } + + public function getMimeType() { + throw new NotFoundException(); + } + + public function fopen($mode) { + throw new NotFoundException(); + } +} diff --git a/lib/files/node/nonexistingfolder.php b/lib/files/node/nonexistingfolder.php new file mode 100644 index 00000000000..0249a026245 --- /dev/null +++ b/lib/files/node/nonexistingfolder.php @@ -0,0 +1,113 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\NotFoundException; + +class NonExistingFolder extends Folder { + /** + * @param string $newPath + * @throws \OC\Files\NotFoundException + */ + public function rename($newPath) { + throw new NotFoundException(); + } + + public function delete() { + throw new NotFoundException(); + } + + public function copy($newPath) { + throw new NotFoundException(); + } + + public function touch($mtime = null) { + throw new NotFoundException(); + } + + public function getId() { + throw new NotFoundException(); + } + + public function stat() { + throw new NotFoundException(); + } + + public function getMTime() { + throw new NotFoundException(); + } + + public function getSize() { + throw new NotFoundException(); + } + + public function getEtag() { + throw new NotFoundException(); + } + + public function getPermissions() { + throw new NotFoundException(); + } + + public function isReadable() { + throw new NotFoundException(); + } + + public function isUpdateable() { + throw new NotFoundException(); + } + + public function isDeletable() { + throw new NotFoundException(); + } + + public function isShareable() { + throw new NotFoundException(); + } + + public function get($path) { + throw new NotFoundException(); + } + + public function getDirectoryListing() { + throw new NotFoundException(); + } + + public function nodeExists($path) { + return false; + } + + public function newFolder($path) { + throw new NotFoundException(); + } + + public function newFile($path) { + throw new NotFoundException(); + } + + public function search($pattern) { + throw new NotFoundException(); + } + + public function searchByMime($mime) { + throw new NotFoundException(); + } + + public function getById($id) { + throw new NotFoundException(); + } + + public function getFreeSpace() { + throw new NotFoundException(); + } + + public function isCreatable() { + throw new NotFoundException(); + } +} diff --git a/lib/files/node/root.php b/lib/files/node/root.php new file mode 100644 index 00000000000..f88d8c294c7 --- /dev/null +++ b/lib/files/node/root.php @@ -0,0 +1,337 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Cache\Scanner; +use OC\Files\Mount\Manager; +use OC\Files\Mount\Mount; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; +use OC\Hooks\Emitter; +use OC\Hooks\PublicEmitter; + +/** + * Class Root + * + * Hooks available in scope \OC\Files + * - preWrite(\OC\Files\Node\Node $node) + * - postWrite(\OC\Files\Node\Node $node) + * - preCreate(\OC\Files\Node\Node $node) + * - postCreate(\OC\Files\Node\Node $node) + * - preDelete(\OC\Files\Node\Node $node) + * - postDelete(\OC\Files\Node\Node $node) + * - preTouch(\OC\Files\Node\Node $node, int $mtime) + * - postTouch(\OC\Files\Node\Node $node) + * - preCopy(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) + * - postCopy(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) + * - preRename(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) + * - postRename(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) + * + * @package OC\Files\Node + */ +class Root extends Folder implements Emitter { + + /** + * @var \OC\Files\Mount\Manager $mountManager + */ + private $mountManager; + + /** + * @var \OC\Hooks\PublicEmitter + */ + private $emitter; + + /** + * @var \OC\User\User $user + */ + private $user; + + /** + * @param \OC\Files\Mount\Manager $manager + * @param \OC\Files\View $view + * @param \OC\User\User $user + */ + public function __construct($manager, $view, $user) { + parent::__construct($this, $view, ''); + $this->mountManager = $manager; + $this->user = $user; + $this->emitter = new PublicEmitter(); + } + + /** + * Get the user for which the filesystem is setup + * + * @return \OC\User\User + */ + public function getUser() { + return $this->user; + } + + /** + * @param string $scope + * @param string $method + * @param callable $callback + */ + public function listen($scope, $method, $callback) { + $this->emitter->listen($scope, $method, $callback); + } + + /** + * @param string $scope optional + * @param string $method optional + * @param callable $callback optional + */ + public function removeListener($scope = null, $method = null, $callback = null) { + $this->emitter->removeListener($scope, $method, $callback); + } + + /** + * @param string $scope + * @param string $method + * @param array $arguments + */ + public function emit($scope, $method, $arguments = array()) { + $this->emitter->emit($scope, $method, $arguments); + } + + /** + * @param \OC\Files\Storage\Storage $storage + * @param string $mountPoint + * @param array $arguments + */ + public function mount($storage, $mountPoint, $arguments = array()) { + $mount = new Mount($storage, $mountPoint, $arguments); + $this->mountManager->addMount($mount); + } + + /** + * @param string $mountPoint + * @return \OC\Files\Mount\Mount + */ + public function getMount($mountPoint) { + return $this->mountManager->find($mountPoint); + } + + /** + * @param string $mountPoint + * @return \OC\Files\Mount\Mount[] + */ + public function getMountsIn($mountPoint) { + return $this->mountManager->findIn($mountPoint); + } + + /** + * @param string $storageId + * @return \OC\Files\Mount\Mount[] + */ + public function getMountByStorageId($storageId) { + return $this->mountManager->findByStorageId($storageId); + } + + /** + * @param int $numericId + * @return Mount[] + */ + public function getMountByNumericStorageId($numericId) { + return $this->mountManager->findByNumericId($numericId); + } + + /** + * @param \OC\Files\Mount\Mount $mount + */ + public function unMount($mount) { + $this->mountManager->remove($mount); + } + + /** + * @param string $path + * @throws \OC\Files\NotFoundException + * @throws \OC\Files\NotPermittedException + * @return Node + */ + public function get($path) { + $path = $this->normalizePath($path); + if ($this->isValidPath($path)) { + $fullPath = $this->getFullPath($path); + if ($this->view->file_exists($fullPath)) { + return $this->createNode($fullPath); + } else { + throw new NotFoundException(); + } + } else { + throw new NotPermittedException(); + } + } + + /** + * search file by id + * + * An array is returned because in the case where a single storage is mounted in different places the same file + * can exist in different places + * + * @param int $id + * @throws \OC\Files\NotFoundException + * @return Node[] + */ + public function getById($id) { + $result = Cache::getById($id); + if (is_null($result)) { + throw new NotFoundException(); + } else { + list($storageId, $internalPath) = $result; + $nodes = array(); + $mounts = $this->mountManager->findByStorageId($storageId); + foreach ($mounts as $mount) { + $nodes[] = $this->get($mount->getMountPoint() . $internalPath); + } + return $nodes; + } + + } + + //most operations cant be done on the root + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function rename($targetPath) { + throw new NotPermittedException(); + } + + public function delete() { + throw new NotPermittedException(); + } + + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function copy($targetPath) { + throw new NotPermittedException(); + } + + /** + * @param int $mtime + * @throws \OC\Files\NotPermittedException + */ + public function touch($mtime = null) { + throw new NotPermittedException(); + } + + /** + * @return \OC\Files\Storage\Storage + * @throws \OC\Files\NotFoundException + */ + public function getStorage() { + throw new NotFoundException(); + } + + /** + * @return string + */ + public function getPath() { + return '/'; + } + + /** + * @return string + */ + public function getInternalPath() { + return ''; + } + + /** + * @return int + */ + public function getId() { + return null; + } + + /** + * @return array + */ + public function stat() { + return null; + } + + /** + * @return int + */ + public function getMTime() { + return null; + } + + /** + * @return int + */ + public function getSize() { + return null; + } + + /** + * @return string + */ + public function getEtag() { + return null; + } + + /** + * @return int + */ + public function getPermissions() { + return \OCP\PERMISSION_CREATE; + } + + /** + * @return bool + */ + public function isReadable() { + return false; + } + + /** + * @return bool + */ + public function isUpdateable() { + return false; + } + + /** + * @return bool + */ + public function isDeletable() { + return false; + } + + /** + * @return bool + */ + public function isShareable() { + return false; + } + + /** + * @return Node + * @throws \OC\Files\NotFoundException + */ + public function getParent() { + throw new NotFoundException(); + } + + /** + * @return string + */ + public function getName() { + return ''; + } +} diff --git a/lib/files/view.php b/lib/files/view.php index 8aee12bf6fe..3a1fdd415b3 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -30,7 +30,7 @@ class View { private $internal_path_cache = array(); private $storage_cache = array(); - public function __construct($root) { + public function __construct($root = '') { $this->fakeRoot = $root; } diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php new file mode 100644 index 00000000000..707106373b5 --- /dev/null +++ b/tests/lib/files/node/file.php @@ -0,0 +1,664 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Node; + +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; +use OC\Files\View; + +class File extends \PHPUnit_Framework_TestCase { + private $user; + + public function setUp() { + $this->user = new \OC\User\User('', new \OC_User_Dummy); + } + + public function testDelete() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->exactly(2)) + ->method('emit') + ->will($this->returnValue(true)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $view->expects($this->once()) + ->method('unlink') + ->with('/bar/foo') + ->will($this->returnValue(true)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->delete(); + } + + public function testDeleteHooks() { + $test = $this; + $hooksRun = 0; + /** + * @param \OC\Files\Node\File $node + */ + $preListener = function ($node) use (&$test, &$hooksRun) { + $test->assertInstanceOf('\OC\Files\Node\File', $node); + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $test->assertEquals(1, $node->getId()); + $hooksRun++; + }; + + /** + * @param \OC\Files\Node\File $node + */ + $postListener = function ($node) use (&$test, &$hooksRun) { + $test->assertInstanceOf('\OC\Files\Node\NonExistingFile', $node); + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $hooksRun++; + }; + + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root->listen('\OC\Files', 'preDelete', $preListener); + $root->listen('\OC\Files', 'postDelete', $postListener); + + $view->expects($this->any()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1))); + + $view->expects($this->once()) + ->method('unlink') + ->with('/bar/foo') + ->will($this->returnValue(true)); + + $view->expects($this->any()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array(null, 'foo'))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->delete(); + $this->assertEquals(2, $hooksRun); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testDeleteNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->delete(); + } + + public function testGetContent() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $hook = function ($file) { + throw new \Exception('Hooks are not supposed to be called'); + }; + + $root->listen('\OC\Files', 'preWrite', $hook); + $root->listen('\OC\Files', 'postWrite', $hook); + + $view->expects($this->once()) + ->method('file_get_contents') + ->with('/bar/foo') + ->will($this->returnValue('bar')); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('bar', $node->getContent()); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testGetContentNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => 0))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->getContent(); + } + + public function testPutContent() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $view->expects($this->once()) + ->method('file_put_contents') + ->with('/bar/foo', 'bar') + ->will($this->returnValue(true)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->putContent('bar'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testPutContentNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->putContent('bar'); + } + + public function testGetMimeType() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->once()) + ->method('getMimeType') + ->with('/bar/foo') + ->will($this->returnValue('text/plain')); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('text/plain', $node->getMimeType()); + } + + public function testFOpenRead() { + $stream = fopen('php://memory', 'w+'); + fwrite($stream, 'bar'); + rewind($stream); + + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $hook = function ($file) { + throw new \Exception('Hooks are not supposed to be called'); + }; + + $root->listen('\OC\Files', 'preWrite', $hook); + $root->listen('\OC\Files', 'postWrite', $hook); + + $view->expects($this->once()) + ->method('fopen') + ->with('/bar/foo', 'r') + ->will($this->returnValue($stream)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $fh = $node->fopen('r'); + $this->assertEquals($stream, $fh); + $this->assertEquals('bar', fread($fh, 3)); + } + + public function testFOpenWrite() { + $stream = fopen('php://memory', 'w+'); + + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, new $view, $this->user); + + $hooksCalled = 0; + $hook = function ($file) use (&$hooksCalled) { + $hooksCalled++; + }; + + $root->listen('\OC\Files', 'preWrite', $hook); + $root->listen('\OC\Files', 'postWrite', $hook); + + $view->expects($this->once()) + ->method('fopen') + ->with('/bar/foo', 'w') + ->will($this->returnValue($stream)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $fh = $node->fopen('w'); + $this->assertEquals($stream, $fh); + fwrite($fh, 'bar'); + rewind($fh); + $this->assertEquals('bar', fread($stream, 3)); + $this->assertEquals(2, $hooksCalled); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testFOpenReadNotPermitted() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $hook = function ($file) { + throw new \Exception('Hooks are not supposed to be called'); + }; + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => 0))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->fopen('r'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testFOpenReadWriteNoReadPermissions() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $hook = function () { + throw new \Exception('Hooks are not supposed to be called'); + }; + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_UPDATE))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->fopen('w'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testFOpenReadWriteNoWritePermissions() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, new $view, $this->user); + + $hook = function () { + throw new \Exception('Hooks are not supposed to be called'); + }; + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node->fopen('w'); + } + + public function testCopySameStorage() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->any()) + ->method('copy') + ->with('/bar/foo', '/bar/asd'); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 3))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + $newNode = new \OC\Files\Node\File($root, $view, '/bar/asd'); + + $root->expects($this->exactly(2)) + ->method('get') + ->will($this->returnValueMap(array( + array('/bar/asd', $newNode), + array('/bar', $parentNode) + ))); + + $target = $node->copy('/bar/asd'); + $this->assertInstanceOf('\OC\Files\Node\File', $target); + $this->assertEquals(3, $target->getId()); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testCopyNotPermitted() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $root->expects($this->never()) + ->method('getMount'); + + $storage->expects($this->never()) + ->method('copy'); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ, 'fileid' => 3))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + + $root->expects($this->once()) + ->method('get') + ->will($this->returnValueMap(array( + array('/bar', $parentNode) + ))); + + $node->copy('/bar/asd'); + } + + /** + * @expectedException \OC\Files\NotFoundException + */ + public function testCopyNoParent() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->never()) + ->method('copy'); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + + $root->expects($this->once()) + ->method('get') + ->with('/bar/asd') + ->will($this->throwException(new NotFoundException())); + + $node->copy('/bar/asd/foo'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testCopyParentIsFile() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->never()) + ->method('copy'); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\File($root, $view, '/bar'); + + $root->expects($this->once()) + ->method('get') + ->will($this->returnValueMap(array( + array('/bar', $parentNode) + ))); + + $node->copy('/bar/asd'); + } + + public function testMoveSameStorage() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->any()) + ->method('rename') + ->with('/bar/foo', '/bar/asd'); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1))); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + + $root->expects($this->any()) + ->method('get') + ->will($this->returnValueMap(array(array('/bar', $parentNode), array('/bar/asd', $node)))); + + $target = $node->move('/bar/asd'); + $this->assertInstanceOf('\OC\Files\Node\File', $target); + $this->assertEquals(1, $target->getId()); + $this->assertEquals('/bar/asd', $node->getPath()); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testMoveNotPermitted() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $view->expects($this->never()) + ->method('rename'); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + + $root->expects($this->once()) + ->method('get') + ->with('/bar') + ->will($this->returnValue($parentNode)); + + $node->move('/bar/asd'); + } + + /** + * @expectedException \OC\Files\NotFoundException + */ + public function testMoveNoParent() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $storage->expects($this->never()) + ->method('rename'); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + + $root->expects($this->once()) + ->method('get') + ->with('/bar') + ->will($this->throwException(new NotFoundException())); + + $node->move('/bar/asd'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testMoveParentIsFile() { + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + + $view->expects($this->never()) + ->method('rename'); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $parentNode = new \OC\Files\Node\File($root, $view, '/bar'); + + $root->expects($this->once()) + ->method('get') + ->with('/bar') + ->will($this->returnValue($parentNode)); + + $node->move('/bar/asd'); + } +} diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php new file mode 100644 index 00000000000..691aa612c7f --- /dev/null +++ b/tests/lib/files/node/folder.php @@ -0,0 +1,479 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Node\Node; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; +use OC\Files\View; + +class Folder extends \PHPUnit_Framework_TestCase { + private $user; + + public function setUp() { + $this->user = new \OC\User\User('', new \OC_User_Dummy); + } + + public function testDelete() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + $root->expects($this->exactly(2)) + ->method('emit') + ->will($this->returnValue(true)); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $view->expects($this->once()) + ->method('rmdir') + ->with('/bar/foo') + ->will($this->returnValue(true)); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->delete(); + } + + public function testDeleteHooks() { + $test = $this; + $hooksRun = 0; + /** + * @param \OC\Files\Node\File $node + */ + $preListener = function ($node) use (&$test, &$hooksRun) { + $test->assertInstanceOf('\OC\Files\Node\Folder', $node); + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $hooksRun++; + }; + + /** + * @param \OC\Files\Node\File $node + */ + $postListener = function ($node) use (&$test, &$hooksRun) { + $test->assertInstanceOf('\OC\Files\Node\NonExistingFolder', $node); + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $hooksRun++; + }; + + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root->listen('\OC\Files', 'preDelete', $preListener); + $root->listen('\OC\Files', 'postDelete', $postListener); + + $view->expects($this->any()) + ->method('getFileInfo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1))); + + $view->expects($this->once()) + ->method('rmdir') + ->with('/bar/foo') + ->will($this->returnValue(true)); + + $view->expects($this->any()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array(null, 'foo'))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->delete(); + $this->assertEquals(2, $hooksRun); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testDeleteNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->delete(); + } + + public function testGetDirectoryContent() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array('')); + $cache->expects($this->any()) + ->method('getStatus') + ->with('foo') + ->will($this->returnValue(Cache::COMPLETE)); + + $cache->expects($this->once()) + ->method('getFolderContents') + ->with('foo') + ->will($this->returnValue(array( + array('fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'), + array('fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory') + ))); + + $permissionsCache = $this->getMock('\OC\Files\Cache\Permissions', array(), array('/')); + $permissionsCache->expects($this->once()) + ->method('getDirectoryPermissions') + ->will($this->returnValue(array(2 => \OCP\PERMISSION_ALL))); + + $root->expects($this->once()) + ->method('getMountsIn') + ->with('/bar/foo') + ->will($this->returnValue(array())); + + $storage->expects($this->any()) + ->method('getPermissionsCache') + ->will($this->returnValue($permissionsCache)); + $storage->expects($this->any()) + ->method('getCache') + ->will($this->returnValue($cache)); + + $view->expects($this->any()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array($storage, 'foo'))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $children = $node->getDirectoryListing(); + $this->assertEquals(2, count($children)); + $this->assertInstanceOf('\OC\Files\Node\File', $children[0]); + $this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]); + $this->assertEquals('asd', $children[0]->getName()); + $this->assertEquals('qwerty', $children[1]->getName()); + } + + public function testGet() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $root->expects($this->once()) + ->method('get') + ->with('/bar/foo/asd'); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->get('asd'); + } + + public function testNodeExists() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd'); + + $root->expects($this->once()) + ->method('get') + ->with('/bar/foo/asd') + ->will($this->returnValue($child)); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $this->assertTrue($node->nodeExists('asd')); + } + + public function testNodeExistsNotExists() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $root->expects($this->once()) + ->method('get') + ->with('/bar/foo/asd') + ->will($this->throwException(new NotFoundException())); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $this->assertFalse($node->nodeExists('asd')); + } + + public function testNewFolder() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $view->expects($this->once()) + ->method('mkdir') + ->with('/bar/foo/asd') + ->will($this->returnValue(true)); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd'); + $result = $node->newFolder('asd'); + $this->assertEquals($child, $result); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testNewFolderNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->newFolder('asd'); + } + + public function testNewFile() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $view->expects($this->once()) + ->method('touch') + ->with('/bar/foo/asd') + ->will($this->returnValue(true)); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $child = new \OC\Files\Node\File($root, $view, '/bar/foo/asd'); + $result = $node->newFile('asd'); + $this->assertEquals($child, $result); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testNewFileNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $node->newFile('asd'); + } + + public function testGetFreeSpace() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('free_space') + ->with('/bar/foo') + ->will($this->returnValue(100)); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $this->assertEquals(100, $node->getFreeSpace()); + } + + public function testSearch() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + $storage = $this->getMock('\OC\Files\Storage\Storage'); + $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array('')); + + $storage->expects($this->once()) + ->method('getCache') + ->will($this->returnValue($cache)); + + $cache->expects($this->once()) + ->method('search') + ->with('%qw%') + ->will($this->returnValue(array( + array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain') + ))); + + $root->expects($this->once()) + ->method('getMountsIn') + ->with('/bar/foo') + ->will($this->returnValue(array())); + + $view->expects($this->once()) + ->method('resolvePath') + ->will($this->returnValue(array($storage, 'foo'))); + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $result = $node->search('qw'); + $this->assertEquals(1, count($result)); + $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath()); + } + + public function testSearchSubStorages() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + $storage = $this->getMock('\OC\Files\Storage\Storage'); + $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array('')); + $subCache = $this->getMock('\OC\Files\Cache\Cache', array(), array('')); + $subStorage = $this->getMock('\OC\Files\Storage\Storage'); + $subMount = $this->getMock('\OC\Files\Mount\Mount', array(), array(null, '')); + + $subMount->expects($this->once()) + ->method('getStorage') + ->will($this->returnValue($subStorage)); + + $subMount->expects($this->once()) + ->method('getMountPoint') + ->will($this->returnValue('/bar/foo/bar/')); + + $storage->expects($this->once()) + ->method('getCache') + ->will($this->returnValue($cache)); + + $subStorage->expects($this->once()) + ->method('getCache') + ->will($this->returnValue($subCache)); + + $cache->expects($this->once()) + ->method('search') + ->with('%qw%') + ->will($this->returnValue(array( + array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain') + ))); + + $subCache->expects($this->once()) + ->method('search') + ->with('%qw%') + ->will($this->returnValue(array( + array('fileid' => 4, 'path' => 'asd/qweasd', 'name' => 'qweasd', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain') + ))); + + $root->expects($this->once()) + ->method('getMountsIn') + ->with('/bar/foo') + ->will($this->returnValue(array($subMount))); + + $view->expects($this->once()) + ->method('resolvePath') + ->will($this->returnValue(array($storage, 'foo'))); + + + $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo'); + $result = $node->search('qw'); + $this->assertEquals(2, count($result)); + } + + public function testIsSubNode() { + $file = new Node(null, null, '/foo/bar'); + $folder = new \OC\Files\Node\Folder(null, null, '/foo'); + $this->assertTrue($folder->isSubNode($file)); + $this->assertFalse($folder->isSubNode($folder)); + + $file = new Node(null, null, '/foobar'); + $this->assertFalse($folder->isSubNode($file)); + } +} diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php new file mode 100644 index 00000000000..c99b6f99ebc --- /dev/null +++ b/tests/lib/files/node/integration.php @@ -0,0 +1,121 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Mount\Manager; +use OC\Files\Node\Root; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; +use OC\Files\Storage\Temporary; +use OC\Files\View; +use OC\User\User; + +class IntegrationTests extends \PHPUnit_Framework_TestCase { + /** + * @var \OC\Files\Node\Root $root + */ + private $root; + + /** + * @var \OC\Files\Storage\Storage[] + */ + private $storages; + + /** + * @var \OC\Files\View $view + */ + private $view; + + public function setUp() { + \OC\Files\Filesystem::init('', ''); + \OC\Files\Filesystem::clearMounts(); + $manager = \OC\Files\Filesystem::getMountManager(); + + \OC_Hook::clear('OC_Filesystem'); + + \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook'); + \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook'); + \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); + \OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook'); + + $user = new User('', new \OC_User_Dummy); + $this->view = new View(); + $this->root = new Root($manager, $this->view, $user); + $storage = new Temporary(array()); + $subStorage = new Temporary(array()); + $this->storages[] = $storage; + $this->storages[] = $subStorage; + $this->root->mount($storage, '/'); + $this->root->mount($subStorage, '/substorage/'); + } + + public function tearDown() { + foreach ($this->storages as $storage) { + $storage->getCache()->clear(); + } + \OC\Files\Filesystem::clearMounts(); + } + + public function testBasicFile() { + $file = $this->root->newFile('/foo.txt'); + $this->assertCount(2, $this->root->getDirectoryListing()); + $this->assertTrue($this->root->nodeExists('/foo.txt')); + $id = $file->getId(); + $this->assertInstanceOf('\OC\Files\Node\File', $file); + $file->putContent('qwerty'); + $this->assertEquals('text/plain', $file->getMimeType()); + $this->assertEquals('qwerty', $file->getContent()); + $this->assertFalse($this->root->nodeExists('/bar.txt')); + $file->move('/bar.txt'); + $this->assertFalse($this->root->nodeExists('/foo.txt')); + $this->assertTrue($this->root->nodeExists('/bar.txt')); + $this->assertEquals('bar.txt', $file->getName()); + $this->assertEquals('bar.txt', $file->getInternalPath()); + + $file->move('/substorage/bar.txt'); + $this->assertNotEquals($id, $file->getId()); + $this->assertEquals('qwerty', $file->getContent()); + } + + public function testBasicFolder() { + $folder = $this->root->newFolder('/foo'); + $this->assertTrue($this->root->nodeExists('/foo')); + $file = $folder->newFile('/bar'); + $this->assertTrue($this->root->nodeExists('/foo/bar')); + $file->putContent('qwerty'); + + $listing = $folder->getDirectoryListing(); + $this->assertEquals(1, count($listing)); + $this->assertEquals($file->getId(), $listing[0]->getId()); + $this->assertEquals($file->getStorage(), $listing[0]->getStorage()); + + + $rootListing = $this->root->getDirectoryListing(); + $this->assertEquals(2, count($rootListing)); + + $folder->move('/asd'); + /** + * @var \OC\Files\Node\File $file + */ + $file = $folder->get('/bar'); + $this->assertInstanceOf('\OC\Files\Node\File', $file); + $this->assertFalse($this->root->nodeExists('/foo/bar')); + $this->assertTrue($this->root->nodeExists('/asd/bar')); + $this->assertEquals('qwerty', $file->getContent()); + $folder->move('/substorage/foo'); + /** + * @var \OC\Files\Node\File $file + */ + $file = $folder->get('/bar'); + $this->assertInstanceOf('\OC\Files\Node\File', $file); + $this->assertTrue($this->root->nodeExists('/substorage/foo/bar')); + $this->assertEquals('qwerty', $file->getContent()); + } +} diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php new file mode 100644 index 00000000000..aa9d2a382eb --- /dev/null +++ b/tests/lib/files/node/node.php @@ -0,0 +1,330 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Node; + +class Node extends \PHPUnit_Framework_TestCase { + private $user; + + public function setUp() { + $this->user = new \OC\User\User('', new \OC_User_Dummy); + } + + public function testStat() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $stat = array( + 'fileid' => 1, + 'size' => 100, + 'etag' => 'qwerty', + 'mtime' => 50, + 'permissions' => 0 + ); + + $view->expects($this->once()) + ->method('stat') + ->with('/bar/foo') + ->will($this->returnValue($stat)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals($stat, $node->stat()); + } + + public function testGetId() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $stat = array( + 'fileid' => 1, + 'size' => 100, + 'etag' => 'qwerty', + 'mtime' => 50 + ); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue($stat)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals(1, $node->getId()); + } + + public function testGetSize() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('filesize') + ->with('/bar/foo') + ->will($this->returnValue(100)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals(100, $node->getSize()); + } + + public function testGetEtag() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $stat = array( + 'fileid' => 1, + 'size' => 100, + 'etag' => 'qwerty', + 'mtime' => 50 + ); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue($stat)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('qwerty', $node->getEtag()); + } + + public function testGetMTime() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $view->expects($this->once()) + ->method('filemtime') + ->with('/bar/foo') + ->will($this->returnValue(50)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals(50, $node->getMTime()); + } + + public function testGetStorage() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $view->expects($this->once()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array($storage, 'foo'))); + + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals($storage, $node->getStorage()); + } + + public function testGetPath() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('/bar/foo', $node->getPath()); + } + + public function testGetInternalPath() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + /** + * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + + $view->expects($this->once()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array($storage, 'foo'))); + + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('foo', $node->getInternalPath()); + } + + public function testGetName() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $this->assertEquals('foo', $node->getName()); + } + + public function testTouchSetMTime() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->once()) + ->method('touch') + ->with('/bar/foo', 100) + ->will($this->returnValue(true)); + + $view->expects($this->once()) + ->method('filemtime') + ->with('/bar/foo') + ->will($this->returnValue(100)); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $node = new \OC\Files\Node\Node($root, $view, '/bar/foo'); + $node->touch(100); + $this->assertEquals(100, $node->getMTime()); + } + + public function testTouchHooks() { + $test = $this; + $hooksRun = 0; + /** + * @param \OC\Files\Node\File $node + */ + $preListener = function ($node) use (&$test, &$hooksRun) { + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $hooksRun++; + }; + + /** + * @param \OC\Files\Node\File $node + */ + $postListener = function ($node) use (&$test, &$hooksRun) { + $test->assertEquals('foo', $node->getInternalPath()); + $test->assertEquals('/bar/foo', $node->getPath()); + $hooksRun++; + }; + + /** + * @var \OC\Files\Mount\Manager $manager + */ + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root->listen('\OC\Files', 'preTouch', $preListener); + $root->listen('\OC\Files', 'postTouch', $postListener); + + $view->expects($this->once()) + ->method('touch') + ->with('/bar/foo', 100) + ->will($this->returnValue(true)); + + $view->expects($this->any()) + ->method('resolvePath') + ->with('/bar/foo') + ->will($this->returnValue(array(null, 'foo'))); + + $view->expects($this->any()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL))); + + $node = new \OC\Files\Node\Node($root, $view, '/bar/foo'); + $node->touch(100); + $this->assertEquals(2, $hooksRun); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testTouchNotPermitted() { + $manager = $this->getMock('\OC\Files\Mount\Manager'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + $root->expects($this->any()) + ->method('getUser') + ->will($this->returnValue($this->user)); + + $view->expects($this->any()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ))); + + $node = new \OC\Files\Node\Node($root, $view, '/bar/foo'); + $node->touch(100); + } +} diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php new file mode 100644 index 00000000000..0b356ec6d97 --- /dev/null +++ b/tests/lib/files/node/root.php @@ -0,0 +1,106 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\NotPermittedException; +use OC\Files\Mount\Manager; + +class Root extends \PHPUnit_Framework_TestCase { + private $user; + + public function setUp() { + $this->user = new \OC\User\User('', new \OC_User_Dummy); + } + + public function testGet() { + $manager = new Manager(); + /** + * @var \OC\Files\Storage\Storage $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $view->expects($this->once()) + ->method('getFileInfo') + ->with('/bar/foo') + ->will($this->returnValue(array('fileid' => 10, 'path' => 'bar/foo', 'name', 'mimetype' => 'text/plain'))); + + $view->expects($this->once()) + ->method('is_dir') + ->with('/bar/foo') + ->will($this->returnValue(false)); + + $view->expects($this->once()) + ->method('file_exists') + ->with('/bar/foo') + ->will($this->returnValue(true)); + + $root->mount($storage, ''); + $node = $root->get('/bar/foo'); + $this->assertEquals(10, $node->getId()); + $this->assertInstanceOf('\OC\Files\Node\File', $node); + } + + /** + * @expectedException \OC\Files\NotFoundException + */ + public function testGetNotFound() { + $manager = new Manager(); + /** + * @var \OC\Files\Storage\Storage $storage + */ + $storage = $this->getMock('\OC\Files\Storage\Storage'); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $view->expects($this->once()) + ->method('file_exists') + ->with('/bar/foo') + ->will($this->returnValue(false)); + + $root->mount($storage, ''); + $root->get('/bar/foo'); + } + + /** + * @expectedException \OC\Files\NotPermittedException + */ + public function testGetInvalidPath() { + $manager = new Manager(); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $root->get('/../foo'); + } + + /** + * @expectedException \OC\Files\NotFoundException + */ + public function testGetNoStorages() { + $manager = new Manager(); + /** + * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + */ + $view = $this->getMock('\OC\Files\View'); + $root = new \OC\Files\Node\Root($manager, $view, $this->user); + + $root->get('/bar/foo'); + } +} -- cgit v1.2.3 From 74c922328123fe40265e3f4e42a34feff057c0d6 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 1 Sep 2013 21:17:48 +0200 Subject: Properly check for tmpavatar, invalidate cache, fix debug msgs --- core/avatar/controller.php | 17 ++++++++++++++--- lib/avatar.php | 3 ++- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 249c4cb6e2b..5044f3374cd 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -28,6 +28,11 @@ class OC_Core_Avatar_Controller { $avatar = new \OC_Avatar(); $image = $avatar->get($user, $size); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); + header('Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT'); + header('Cache-Control: no-store, no-cache, must-revalidate'); + header('Cache-Control: post-check=0, pre-check=0', false); + header('Pragma: no-cache'); if ($image instanceof \OC_Image) { $image->show(); } elseif ($image === false) { @@ -99,12 +104,18 @@ class OC_Core_Avatar_Controller { $user = OC_User::getUser(); $tmpavatar = \OC_Cache::get('tmpavatar'); - if ($tmpavatar === false) { - \OC_JSON::error(); + if (is_null($tmpavatar)) { + $l = new \OC_L10n('core'); + \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); return; } $image = new \OC_Image($tmpavatar); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); + header('Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT'); + header('Cache-Control: no-store, no-cache, must-revalidate'); + header('Cache-Control: post-check=0, pre-check=0', false); + header('Pragma: no-cache'); $image->show(); } @@ -119,7 +130,7 @@ class OC_Core_Avatar_Controller { } $tmpavatar = \OC_Cache::get('tmpavatar'); - if ($tmpavatar === false) { + if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); return; diff --git a/lib/avatar.php b/lib/avatar.php index eb1f2e18295..5ecce050d24 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -28,7 +28,8 @@ class OC_Avatar { return false; } - $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext)); + $avatar = new OC_Image(); + $avatar->loadFromData($view->file_get_contents('avatar.'.$ext)); $avatar->resize($size); return $avatar; } -- cgit v1.2.3 From e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 2 Sep 2013 17:07:38 +0200 Subject: Fix some of @jancborchardt's complaints in oc_avatars --- core/avatar/controller.php | 6 +++--- lib/avatar.php | 2 +- settings/js/personal.js | 2 +- settings/templates/personal.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 045d768dc14..5264327b641 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -34,7 +34,7 @@ class OC_Core_Avatar_Controller { \OC_Response::setETagHeader(crc32($image->data())); $image->show(); } elseif ($image === false) { - \OC_JSON::success(array('user' => \OC_User::getDisplayName($user), 'size' => $size)); + \OC_JSON::success(array('user' => $user, 'size' => $size)); } } @@ -104,7 +104,7 @@ class OC_Core_Avatar_Controller { $tmpavatar = \OC_Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); - \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); + \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); return; } @@ -128,7 +128,7 @@ class OC_Core_Avatar_Controller { $tmpavatar = \OC_Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); - \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); + \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); return; } diff --git a/lib/avatar.php b/lib/avatar.php index 5ecce050d24..9b2a7fe07cf 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -46,7 +46,7 @@ class OC_Avatar { public function set ($user, $data) { if (\OC_Appconfig::getValue('files_encryption', 'enabled') === "yes") { $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Custom avatars don't work with encryption yet")); + throw new \Exception($l->t("Custom profile pictures don't work with encryption yet")); } $view = new \OC\Files\View('/'.$user); diff --git a/settings/js/personal.js b/settings/js/personal.js index 9823b2804bf..d9b6836568e 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -212,7 +212,7 @@ $(document).ready(function(){ $('#uploadavatar').fileupload(uploadparms); $('#selectavatar').click(function(){ - OC.dialogs.filepicker(t('settings', "Select an avatar"), selectAvatar, false, "image"); + OC.dialogs.filepicker(t('settings', "Select a profile picture"), selectAvatar, false, "image"); }); $('#removeavatar').click(function(){ diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d4a0e3b9480..fcef0f8a578 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -83,14 +83,14 @@ if($_['passwordChangeSupported']) {
      - t('Profile Image')); ?> + t('Profile picture')); ?>

      - t('Has to be square and either PNG or JPG')); ?>
      t('Upload new')); ?>
      -
      t('Select new from files')); ?>
      -
      t('Remove image')); ?>
      +
      t('Select new from Files')); ?>
      +
      t('Remove image')); ?>

      + t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
      -- cgit v1.2.3 From fe0b8ac2c0e4ffd06ab8a14d18a701e1ab9071af Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 3 Sep 2013 07:46:55 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/fr.php | 8 +++-- apps/files/l10n/pt_BR.php | 2 ++ apps/files_encryption/l10n/fr.php | 2 ++ apps/files_encryption/l10n/hu_HU.php | 14 ++++++++- apps/files_sharing/l10n/fr.php | 6 ++++ apps/files_trashbin/l10n/fr.php | 5 +-- apps/files_versions/l10n/fr.php | 3 ++ apps/user_webdavauth/l10n/fr.php | 4 ++- core/l10n/fr.php | 17 +++++++--- core/l10n/hi.php | 14 +++++++++ l10n/fr/core.po | 40 ++++++++++++------------ l10n/fr/files.po | 22 ++++++------- l10n/fr/files_encryption.po | 16 +++++----- l10n/fr/files_sharing.po | 23 +++++++------- l10n/fr/files_trashbin.po | 31 ++++++++++--------- l10n/fr/files_versions.po | 15 ++++----- l10n/fr/lib.po | 32 +++++++++---------- l10n/fr/settings.po | 60 ++++++++++++++++++------------------ l10n/fr/user_webdavauth.po | 12 ++++---- l10n/hi/core.po | 35 +++++++++++---------- l10n/hu_HU/files_encryption.po | 37 +++++++++++----------- l10n/pt_BR/files.po | 10 +++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 8 ++--- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.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/fr.php | 8 ++--- settings/l10n/fr.php | 16 ++++++++++ 35 files changed, 267 insertions(+), 193 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 4e3b0de112a..ce19bb60eb7 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "annuler", "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}", "undo" => "annuler", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"), +"_%n file_::_%n files_" => array("%n fichier","%n fichiers"), +"{dirs} and {files}" => "{dir} et {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"), "files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", "File name cannot be empty." => "Le nom de fichier ne peut être vide.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.", "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !", "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.", "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.", "Name" => "Nom", "Size" => "Taille", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 15d0c170e66..de9644bd588 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfazer", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", @@ -42,6 +43,7 @@ $TRANSLATIONS = array( "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!", "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.", "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.", "Name" => "Nome", "Size" => "Tamanho", diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index 12af8101394..358937441e2 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -10,6 +10,8 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.", "Missing requirements." => "Système minimum requis non respecté.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.", +"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", "Saving..." => "Enregistrement...", "Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.", "You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre", diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php index 49dcf817fb7..323291bbfbe 100644 --- a/apps/files_encryption/l10n/hu_HU.php +++ b/apps/files_encryption/l10n/hu_HU.php @@ -1,6 +1,18 @@ "Visszaállítási kulcs sikeresen kikapcsolva", +"Password successfully changed." => "Jelszó sikeresen megváltoztatva.", +"Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás.", "Saving..." => "Mentés...", -"Encryption" => "Titkosítás" +"personal settings" => "személyes beállítások", +"Encryption" => "Titkosítás", +"Enabled" => "Bekapcsolva", +"Disabled" => "Kikapcsolva", +"Change Password" => "Jelszó megváltoztatása", +"Old log-in password" => "Régi bejelentkezési jelszó", +"Current log-in password" => "Jelenlegi bejelentkezési jelszó", +"Update Private Key Password" => "Privát kulcs jelszó frissítése", +"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php index b263cd87959..c97a1db97e4 100644 --- a/apps/files_sharing/l10n/fr.php +++ b/apps/files_sharing/l10n/fr.php @@ -3,6 +3,12 @@ $TRANSLATIONS = array( "The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.", "Password" => "Mot de passe", "Submit" => "Envoyer", +"Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.", +"Reasons might be:" => "Les raisons peuvent être :", +"the item was removed" => "l'item a été supprimé", +"the link expired" => "le lien a expiré", +"sharing is disabled" => "le partage est désactivé", +"For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", "%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous", "%s shared the file %s with you" => "%s a partagé le fichier %s avec vous", "Download" => "Télécharger", diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php index 8854190e2ce..45527805ce1 100644 --- a/apps/files_trashbin/l10n/fr.php +++ b/apps/files_trashbin/l10n/fr.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Supprimer de façon définitive", "Name" => "Nom", "Deleted" => "Effacé", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n dossiers"), +"_%n file_::_%n files_" => array("","%n fichiers"), +"restored" => "restauré", "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !", "Restore" => "Restaurer", "Delete" => "Supprimer", diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 537783e6c9f..7f3df1bce41 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "Impossible de restaurer %s", "Versions" => "Versions", +"Failed to revert {file} to revision {timestamp}." => "Échec du retour du fichier {file} à la révision {timestamp}.", +"More versions..." => "Plus de versions...", +"No other versions available" => "Aucune autre version disponible", "Restore" => "Restaurer" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php index 0130e35c816..709fa53dac5 100644 --- a/apps/user_webdavauth/l10n/fr.php +++ b/apps/user_webdavauth/l10n/fr.php @@ -1,5 +1,7 @@ "Authentification WebDAV" +"WebDAV Authentication" => "Authentification WebDAV", +"Address: " => "Adresse :", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 81fad258337..0f338a09340 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s partagé »%s« avec vous", "group" => "groupe", +"Turned on maintenance mode" => "Basculé en mode maintenance", +"Turned off maintenance mode" => "Basculé en mode production (non maintenance)", +"Updated database" => "Base de données mise à jour", +"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...", +"Updated filecache" => "Cache de fichier mis à jour", +"... %d%% done ..." => "... %d%% effectué ...", "Category type not provided." => "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: %s" => "Cette catégorie existe déjà : %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "décembre", "Settings" => "Paramètres", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"), +"_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("il y a %n jour","il y a %n jours"), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"), "months ago" => "il y a plusieurs mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "Email envoyé", "The update was unsuccessful. Please report this issue to the ownCloud community." => "La mise à jour a échoué. Veuillez signaler ce problème à la communauté ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", +"%s password reset" => "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.
      Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.
      Au besoin, contactez votre administrateur local.", "Request failed!
      Did you make sure your email/username was right?" => "Requête en échec!
      Avez-vous vérifié vos courriel/nom d'utilisateur?", @@ -108,9 +115,11 @@ $TRANSLATIONS = array( "Add" => "Ajouter", "Security Warning" => "Avertissement de sécurité", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner", +"For information how to properly configure your server, please see the documentation." => "Pour les informations de configuration de votre serveur, veuillez lire la documentation.", "Create an admin account" => "Créer un compte administrateur", "Advanced" => "Avancé", "Data folder" => "Répertoire des données", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 00cb5926d70..29e67f68abf 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -1,5 +1,15 @@ "कैटेगरी प्रकार उपलब्ध नहीं है", +"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s", +"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ", +"Sunday" => "रविवार", +"Monday" => "सोमवार", +"Tuesday" => "मंगलवार", +"Wednesday" => "बुधवार", +"Thursday" => "बृहस्पतिवार", +"Friday" => "शुक्रवार", +"Saturday" => "शनिवार", "January" => "जनवरी", "February" => "फरवरी", "March" => "मार्च", @@ -21,6 +31,9 @@ $TRANSLATIONS = array( "Share" => "साझा करें", "Share with" => "के साथ साझा", "Password" => "पासवर्ड", +"Send" => "भेजें", +"Sending ..." => "भेजा जा रहा है", +"Email sent" => "ईमेल भेज दिया गया है ", "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", "Username" => "प्रयोक्ता का नाम", @@ -31,6 +44,7 @@ $TRANSLATIONS = array( "Apps" => "Apps", "Help" => "सहयोग", "Cloud not found" => "क्लौड नहीं मिला ", +"Add" => "डाले", "Create an admin account" => "व्यवस्थापक खाता बनाएँ", "Advanced" => "उन्नत", "Data folder" => "डाटा फोल्डर", diff --git a/l10n/fr/core.po b/l10n/fr/core.po index f5b034ae31c..4215f9dc597 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 09:30+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -33,28 +33,28 @@ msgstr "groupe" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Basculé en mode maintenance" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Basculé en mode production (non maintenance)" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de données mise à jour" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Cache de fichier mis à jour" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% effectué ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -182,14 +182,14 @@ msgstr "il y a quelques secondes" #: js/js.js:813 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il y a %n minute" +msgstr[1] "il y a %n minutes" #: js/js.js:814 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il y a %n heure" +msgstr[1] "Il y a %n heures" #: js/js.js:815 msgid "today" @@ -202,8 +202,8 @@ msgstr "hier" #: js/js.js:817 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il y a %n jour" +msgstr[1] "il y a %n jours" #: js/js.js:818 msgid "last month" @@ -212,8 +212,8 @@ msgstr "le mois dernier" #: js/js.js:819 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il y a %n mois" +msgstr[1] "Il y a %n mois" #: js/js.js:820 msgid "months ago" @@ -410,7 +410,7 @@ msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "Réinitialisation de votre mot de passe %s" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -527,7 +527,7 @@ msgstr "Votre version de PHP est vulnérable à l'attaque par caractère NULL (C #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée." #: templates/installation.php:32 msgid "" @@ -552,7 +552,7 @@ msgstr "Votre répertoire data est certainement accessible depuis l'internet car msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Pour les informations de configuration de votre serveur, veuillez lire la documentation." #: templates/installation.php:47 msgid "Create an admin account" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 245c7abab6b..aca28388062 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-03 09:25+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -161,24 +161,24 @@ msgstr "annuler" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dossier" +msgstr[1] "%n dossiers" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n fichier" +msgstr[1] "%n fichiers" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dir} et {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Téléversement de %n fichier" +msgstr[1] "Téléversement de %n fichiers" #: js/filelist.js:628 msgid "files uploading" @@ -210,7 +210,7 @@ msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers." #: js/files.js:245 msgid "" diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po index 174e4d3f3a3..6616ed62275 100644 --- a/l10n/fr/files_encryption.po +++ b/l10n/fr/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-03 10:00+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -65,20 +65,20 @@ msgid "" "files." msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "Système minimum requis non respecté." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :" #: js/settings-admin.js:11 msgid "Saving..." diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index c6eae4ea599..6f0ea28d9c5 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -4,13 +4,14 @@ # # Translators: # square , 2013 +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:10+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -32,27 +33,27 @@ msgstr "Envoyer" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Désolé, mais le lien semble ne plus fonctionner." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Les raisons peuvent être :" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "l'item a été supprimé" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "le lien a expiré" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "le partage est désactivé" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien." #: templates/public.php:15 #, php-format @@ -64,7 +65,7 @@ msgstr "%s a partagé le répertoire %s avec vous" msgid "%s shared the file %s with you" msgstr "%s a partagé le fichier %s avec vous" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Télécharger" @@ -76,6 +77,6 @@ msgstr "Envoyer" msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Pas d'aperçu disponible pour" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 464c518b8a5..52238114518 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 09:30+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -27,45 +28,45 @@ msgstr "Impossible d'effacer %s de façon permanente" msgid "Couldn't restore %s" msgstr "Impossible de restaurer %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "effectuer l'opération de restauration" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Erreur" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "effacer définitivement le fichier" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Supprimer de façon définitive" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Effacé" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n dossiers" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n fichiers" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "restauré" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po index 79799c762b9..d5ea6a33082 100644 --- a/l10n/fr/files_versions.po +++ b/l10n/fr/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:10+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -28,16 +29,16 @@ msgstr "Versions" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Échec du retour du fichier {file} à la révision {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "Plus de versions..." #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "Aucune autre version disponible" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Restaurer" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 5bd611ff268..bc0c4a9abbd 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-03 07:44-0400\n" +"PO-Revision-Date: 2013-09-03 09:30+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" @@ -265,51 +265,51 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s msgid "Please double check the installation guides." msgstr "Veuillez vous référer au guide d'installation." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "il y a quelques secondes" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "il y a %n minutes" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "Il y a %n heures" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "aujourd'hui" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "hier" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "il y a %n jours" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "le mois dernier" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "Il y a %n mois" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "l'année dernière" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "il y a plusieurs années" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index bd79bb2891d..fd619afbb0c 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:44-0400\n" +"PO-Revision-Date: 2013-09-03 09:50+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -88,53 +88,53 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s" msgid "Couldn't update app." msgstr "Impossible de mettre à jour l'application" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Mettre à jour vers {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Désactiver" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activer" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Veuillez patienter…" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Erreur lors de la désactivation de l'application" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Erreur lors de l'activation de l'application" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Mise à jour..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Erreur lors de la mise à jour de l'application" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Erreur" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Mettre à jour" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Mise à jour effectuée avec succès" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." #: js/personal.js:172 msgid "Saving..." @@ -196,7 +196,7 @@ msgid "" "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 "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web." #: templates/admin.php:29 msgid "Setup Warning" @@ -211,7 +211,7 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Veuillez consulter à nouveau les guides d'installation." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -233,7 +233,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -246,7 +246,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes." #: templates/admin.php:92 msgid "Cron" @@ -260,11 +260,11 @@ msgstr "Exécute une tâche à chaque chargement de page" msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Utilise le service cron du système pour appeler cron.php une fois par minute." #: templates/admin.php:120 msgid "Sharing" @@ -288,12 +288,12 @@ msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l' #: templates/admin.php:143 msgid "Allow public uploads" -msgstr "" +msgstr "Autoriser les téléversements publics" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur" #: templates/admin.php:152 msgid "Allow resharing" @@ -322,14 +322,14 @@ msgstr "Forcer HTTPS" #: templates/admin.php:185 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "" +msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée." #: templates/admin.php:191 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL." #: templates/admin.php:203 msgid "Log" @@ -483,15 +483,15 @@ msgstr "Chiffrement" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Mot de passe de connexion" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Déchiffrer tous les fichiers" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index c4a85dce02d..d24a55c6e23 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -5,7 +5,7 @@ # Translators: # Adalberto Rodrigues , 2013 # Christophe Lherieau , 2013 -# mishka , 2013 +# mishka, 2013 # ouafnico , 2012 # Robert Di Rosa <>, 2012 # Romain DEP. , 2012-2013 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 10:00+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -29,11 +29,11 @@ msgstr "Authentification WebDAV" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Adresse :" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 479e61d7c60..dd5f832c464 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Debanjum , 2013 # rktaiwala , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:00+0000\n" +"Last-Translator: Debanjum \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +55,7 @@ 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?" @@ -63,13 +64,13 @@ msgstr "" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "यह कैटेगरी पहले से ही मौजूद है: %s" #: 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 @@ -93,31 +94,31 @@ msgstr "" #: js/config.php:32 msgid "Sunday" -msgstr "" +msgstr "रविवार" #: js/config.php:33 msgid "Monday" -msgstr "" +msgstr "सोमवार" #: js/config.php:34 msgid "Tuesday" -msgstr "" +msgstr "मंगलवार" #: js/config.php:35 msgid "Wednesday" -msgstr "" +msgstr "बुधवार" #: js/config.php:36 msgid "Thursday" -msgstr "" +msgstr "बृहस्पतिवार" #: js/config.php:37 msgid "Friday" -msgstr "" +msgstr "शुक्रवार" #: js/config.php:38 msgid "Saturday" -msgstr "" +msgstr "शनिवार" #: js/config.php:43 msgid "January" @@ -318,7 +319,7 @@ msgstr "" #: js/share.js:203 msgid "Send" -msgstr "" +msgstr "भेजें" #: js/share.js:208 msgid "Set expiration date" @@ -386,11 +387,11 @@ msgstr "" #: js/share.js:670 msgid "Sending ..." -msgstr "" +msgstr "भेजा जा रहा है" #: js/share.js:681 msgid "Email sent" -msgstr "" +msgstr "ईमेल भेज दिया गया है " #: js/update.js:17 msgid "" @@ -509,7 +510,7 @@ msgstr "" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "डाले" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po index 7f282b4ac56..b21350959cb 100644 --- a/l10n/hu_HU/files_encryption.po +++ b/l10n/hu_HU/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# blackc0de , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-01 19:30+0000\n" +"Last-Translator: blackc0de \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" @@ -28,7 +29,7 @@ msgstr "" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Visszaállítási kulcs sikeresen kikapcsolva" #: ajax/adminrecovery.php:53 msgid "" @@ -37,11 +38,11 @@ msgstr "" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Jelszó sikeresen megváltoztatva." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó." #: ajax/updatePrivateKeyPassword.php:51 msgid "Private key password successfully updated." @@ -61,18 +62,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" msgstr "" @@ -92,7 +93,7 @@ msgstr "" #: templates/invalid_private_key.php:7 msgid "personal settings" -msgstr "" +msgstr "személyes beállítások" #: templates/settings-admin.php:5 templates/settings-personal.php:4 msgid "Encryption" @@ -109,11 +110,11 @@ msgstr "" #: templates/settings-admin.php:21 templates/settings-personal.php:54 msgid "Enabled" -msgstr "" +msgstr "Bekapcsolva" #: templates/settings-admin.php:29 templates/settings-personal.php:62 msgid "Disabled" -msgstr "" +msgstr "Kikapcsolva" #: templates/settings-admin.php:34 msgid "Change recovery key password:" @@ -129,7 +130,7 @@ msgstr "" #: templates/settings-admin.php:53 msgid "Change Password" -msgstr "" +msgstr "Jelszó megváltoztatása" #: templates/settings-personal.php:11 msgid "Your private key password no longer match your log-in password:" @@ -147,19 +148,19 @@ msgstr "" #: templates/settings-personal.php:24 msgid "Old log-in password" -msgstr "" +msgstr "Régi bejelentkezési jelszó" #: templates/settings-personal.php:30 msgid "Current log-in password" -msgstr "" +msgstr "Jelenlegi bejelentkezési jelszó" #: templates/settings-personal.php:35 msgid "Update Private Key Password" -msgstr "" +msgstr "Privát kulcs jelszó frissítése" #: templates/settings-personal.php:45 msgid "Enable password recovery:" -msgstr "" +msgstr "Jelszó-visszaállítás bekapcsolása" #: templates/settings-personal.php:47 msgid "" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 4397a9890b0..53543fba7d5 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-02 15:40+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -172,7 +172,7 @@ msgstr[1] "" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" #: js/filelist.js:563 msgid "Uploading %n file" @@ -210,7 +210,7 @@ msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos." #: js/files.js:245 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index f2f058e8d24..4c0e3a677c2 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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 7e2f79d2672..8e7a4df03e9 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:42-0400\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 0e11e6f04d5..b4ab99474a0 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,18 +60,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now, " "the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" msgstr "" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index c0de53d8589..780ae791813 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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 ba7bdaaa82e..e5052a67c11 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index ca149fb14cc..c468f343d19 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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 4c568ee555b..170cd574cb0 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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 4d24c3c7a11..802d246a6ac 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:44-0400\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 462831bc96f..c5c3abed6cc 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:44-0400\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 a5d6146f1c3..3990f5bce43 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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 1e53a5a759e..8a84e0fe61a 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-03 07:43-0400\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/fr.php b/lib/l10n/fr.php index cfcca28d5f8..b9ba71c402e 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -37,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.", "Please double check the installation guides." => "Veuillez vous référer au guide d'installation.", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","il y a %n minutes"), +"_%n hour ago_::_%n hours ago_" => array("","Il y a %n heures"), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","il y a %n jours"), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 536cac96568..d973ab30afd 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Désactiver", "Enable" => "Activer", "Please wait...." => "Veuillez patienter…", +"Error while disabling app" => "Erreur lors de la désactivation de l'application", +"Error while enabling app" => "Erreur lors de l'activation de l'application", "Updating...." => "Mise à jour...", "Error while updating app" => "Erreur lors de la mise à jour de l'application", "Error" => "Erreur", "Update" => "Mettre à jour", "Updated" => "Mise à jour effectuée avec succès", +"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.", "Saving..." => "Enregistrement...", "deleted" => "supprimé", "undo" => "annuler", @@ -38,25 +41,35 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Un mot de passe valide doit être saisi", "__language_name__" => "Français", "Security Warning" => "Avertissement de sécurité", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.", "Setup Warning" => "Avertissement, problème de configuration", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.", +"Please double check the installation guides." => "Veuillez consulter à nouveau les guides d'installation.", "Module 'fileinfo' missing" => "Module 'fileinfo' manquant", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.", "Locale not working" => "Localisation non fonctionnelle", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s.", "Internet connection not working" => "La connexion internet ne fonctionne pas", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.", "Cron" => "Cron", "Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http.", +"Use systems cron service to call the cron.php file once a minute." => "Utilise le service cron du système pour appeler cron.php une fois par minute.", "Sharing" => "Partage", "Enable Share API" => "Activer l'API de partage", "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage", "Allow links" => "Autoriser les liens", "Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens", +"Allow public uploads" => "Autoriser les téléversements publics", +"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur", "Allow resharing" => "Autoriser le repartage", "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux", "Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde", "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement", "Security" => "Sécurité", "Enforce HTTPS" => "Forcer HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.", "Log" => "Log", "Log level" => "Niveau de log", "More" => "Plus", @@ -92,6 +105,9 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Utilisez cette adresse pour accéder à vos fichiers via WebDAV", "Encryption" => "Chiffrement", +"The encryption app is no longer enabled, decrypt all your file" => "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers", +"Log-in password" => "Mot de passe de connexion", +"Decrypt all Files" => "Déchiffrer tous les fichiers", "Login Name" => "Nom de la connexion", "Create" => "Créer", "Admin Recovery Password" => "Récupération du mot de passe administrateur", -- cgit v1.2.3 From 823b4cce603d1d0a404d8b93fcca6101ff839767 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 4 Sep 2013 08:16:27 +0200 Subject: More trimming --- lib/vcategories.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/vcategories.php b/lib/vcategories.php index 84036958359..a7e4c54be29 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -179,6 +179,7 @@ class OC_VCategories { if(is_numeric($category)) { $catid = $category; } elseif(is_string($category)) { + $category = trim($category); $catid = $this->array_searchi($category, $this->categories); } OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); @@ -240,6 +241,7 @@ class OC_VCategories { if(is_numeric($category)) { $catid = $category; } elseif(is_string($category)) { + $category = trim($category); $catid = $this->array_searchi($category, $this->categories); } OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); @@ -301,6 +303,7 @@ class OC_VCategories { * @returns int the id of the added category or false if it already exists. */ public function add($name) { + $name = trim($name); OCP\Util::writeLog('core', __METHOD__.', name: ' . $name, OCP\Util::DEBUG); if($this->hasCategory($name)) { OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG); @@ -331,6 +334,8 @@ class OC_VCategories { * @returns bool */ public function rename($from, $to) { + $from = trim($from); + $to = trim($to); $id = $this->array_searchi($from, $this->categories); if($id === false) { OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG); @@ -656,6 +661,7 @@ class OC_VCategories { public function addToCategory($objid, $category, $type = null) { $type = is_null($type) ? $this->type : $type; if(is_string($category) && !is_numeric($category)) { + $category = trim($category); if(!$this->hasCategory($category)) { $this->add($category, true); } @@ -688,9 +694,13 @@ class OC_VCategories { */ public function removeFromCategory($objid, $category, $type = null) { $type = is_null($type) ? $this->type : $type; - $categoryid = (is_string($category) && !is_numeric($category)) - ? $this->array_searchi($category, $this->categories) - : $category; + if(is_string($category) && !is_numeric($category)) { + $category = trim($category); + $categoryid = $this->array_searchi($category, $this->categories); + } else { + $categoryid = $category; + } + try { $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; @@ -716,6 +726,8 @@ class OC_VCategories { $names = array($names); } + $names = array_map('trim', $names); + OC_Log::write('core', __METHOD__ . ', before: ' . print_r($this->categories, true), OC_Log::DEBUG); foreach($names as $name) { -- cgit v1.2.3 From ec3639dc7a28348b136d2008e692cffe8c3753ad Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 4 Sep 2013 13:06:04 +0200 Subject: Always check variable type before using readdir to avoid surprises --- apps/files_external/lib/amazons3.php | 39 ++++++++++++++++++++---------------- apps/files_external/lib/google.php | 12 ++++++----- apps/files_external/lib/irods.php | 14 +++++++------ apps/files_external/lib/smb.php | 12 ++++++----- apps/files_trashbin/index.php | 31 ++++++++++++++-------------- lib/app.php | 14 +++++++------ lib/archive.php | 3 ++- lib/cache/file.php | 11 +++++++--- lib/cache/fileglobal.php | 20 ++++++++++-------- lib/connector/sabre/objecttree.php | 8 +++++--- lib/files/cache/scanner.php | 28 ++++++++++++++------------ lib/files/storage/common.php | 21 ++++++++++--------- lib/files/view.php | 8 +++++--- lib/installer.php | 10 +++++---- 14 files changed, 133 insertions(+), 98 deletions(-) (limited to 'lib') diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 2d7bcd4ac37..c08a266b48c 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -183,17 +183,20 @@ class AmazonS3 extends \OC\Files\Storage\Common { } $dh = $this->opendir($path); - while (($file = readdir($dh)) !== false) { - if ($file === '.' || $file === '..') { - continue; - } - if ($this->is_dir($path . '/' . $file)) { - $this->rmdir($path . '/' . $file); - } else { - $this->unlink($path . '/' . $file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file === '.' || $file === '..') { + continue; + } + + if ($this->is_dir($path . '/' . $file)) { + $this->rmdir($path . '/' . $file); + } else { + $this->unlink($path . '/' . $file); + } } - } + } try { $result = $this->connection->deleteObject(array( @@ -464,15 +467,17 @@ class AmazonS3 extends \OC\Files\Storage\Common { } $dh = $this->opendir($path1); - while (($file = readdir($dh)) !== false) { - if ($file === '.' || $file === '..') { - continue; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file === '.' || $file === '..') { + continue; + } + + $source = $path1 . '/' . $file; + $target = $path2 . '/' . $file; + $this->copy($source, $target); } - - $source = $path1 . '/' . $file; - $target = $path2 . '/' . $file; - $this->copy($source, $target); - } + } } return true; diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 215bdcda6c2..b63b5885de1 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -206,14 +206,16 @@ class Google extends \OC\Files\Storage\Common { public function rmdir($path) { if (trim($path, '/') === '') { $dir = $this->opendir($path); - while (($file = readdir($dh)) !== false) { - if (!\OC\Files\Filesystem::isIgnoredDir($file)) { - if (!$this->unlink($path.'/'.$file)) { - return false; + if(is_resource($dir)) { + while (($file = readdir($dir)) !== false) { + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { + if (!$this->unlink($path.'/'.$file)) { + return false; + } } } + closedir($dir); } - closedir($dir); $this->driveFiles = array(); return true; } else { diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php index 7ec3b3a0cfc..f7279a6c5d2 100644 --- a/apps/files_external/lib/irods.php +++ b/apps/files_external/lib/irods.php @@ -55,7 +55,7 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ } else { throw new \Exception(); } - + } public static function login( $params ) { @@ -137,11 +137,13 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ private function collectionMTime($path) { $dh = $this->opendir($path); $lastCTime = $this->filemtime($path); - while (($file = readdir($dh)) !== false) { - if ($file != '.' and $file != '..') { - $time = $this->filemtime($file); - if ($time > $lastCTime) { - $lastCTime = $time; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file != '.' and $file != '..') { + $time = $this->filemtime($file); + if ($time > $lastCTime) { + $lastCTime = $time; + } } } } diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 8e7a28fba1a..ecd4dae0484 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -99,11 +99,13 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ private function shareMTime() { $dh=$this->opendir(''); $lastCtime=0; - while (($file = readdir($dh)) !== false) { - if ($file!='.' and $file!='..') { - $ctime=$this->filemtime($file); - if ($ctime>$lastCtime) { - $lastCtime=$ctime; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file!='.' and $file!='..') { + $ctime=$this->filemtime($file); + if ($ctime>$lastCtime) { + $lastCtime=$ctime; + } } } } diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 0baeab1de97..0dd6944281c 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -23,23 +23,24 @@ if ($dir) { $dirlisting = true; $dirContent = $view->opendir($dir); $i = 0; - while(($entryName = readdir($dirContent)) !== false) { - if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) { - $pos = strpos($dir.'/', '/', 1); - $tmp = substr($dir, 0, $pos); - $pos = strrpos($tmp, '.d'); - $timestamp = substr($tmp, $pos+2); - $result[] = array( - 'id' => $entryName, - 'timestamp' => $timestamp, - 'mime' => $view->getMimeType($dir.'/'.$entryName), - 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file', - 'location' => $dir, - ); + if(is_resource($dirContent)) { + while(($entryName = readdir($dirContent)) !== false) { + if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) { + $pos = strpos($dir.'/', '/', 1); + $tmp = substr($dir, 0, $pos); + $pos = strrpos($tmp, '.d'); + $timestamp = substr($tmp, $pos+2); + $result[] = array( + 'id' => $entryName, + 'timestamp' => $timestamp, + 'mime' => $view->getMimeType($dir.'/'.$entryName), + 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file', + 'location' => $dir, + ); + } } + closedir($dirContent); } - closedir($dirContent); - } else { $dirlisting = false; $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?'); diff --git a/lib/app.php b/lib/app.php index 1a0a7e6f9a9..d98af2dc296 100644 --- a/lib/app.php +++ b/lib/app.php @@ -667,14 +667,16 @@ class OC_App{ } $dh = opendir( $apps_dir['path'] ); - while (($file = readdir($dh)) !== false) { + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { - if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) { + if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) { - $apps[] = $file; + $apps[] = $file; - } + } + } } } @@ -868,10 +870,10 @@ class OC_App{ /** - * Compares the app version with the owncloud version to see if the app + * Compares the app version with the owncloud version to see if the app * requires a newer version than the currently active one * @param array $owncloudVersions array with 3 entries: major minor bugfix - * @param string $appRequired the required version from the xml + * @param string $appRequired the required version from the xml * major.minor.bugfix * @return boolean true if compatible, otherwise false */ diff --git a/lib/archive.php b/lib/archive.php index 364cd5a74a1..85bfae57295 100644 --- a/lib/archive.php +++ b/lib/archive.php @@ -119,7 +119,8 @@ abstract class OC_Archive{ * @return bool */ function addRecursive($path, $source) { - if($dh=opendir($source)) { + $dh = opendir($source); + if(is_resource($dh)) { $this->addFolder($path); while (($file = readdir($dh)) !== false) { if($file=='.' or $file=='..') { diff --git a/lib/cache/file.php b/lib/cache/file.php index 9fee6034a71..361138e4736 100644 --- a/lib/cache/file.php +++ b/lib/cache/file.php @@ -80,9 +80,11 @@ class OC_Cache_File{ $storage = $this->getStorage(); if($storage and $storage->is_dir('/')) { $dh=$storage->opendir('/'); - while (($file = readdir($dh)) !== false) { - if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { - $storage->unlink('/'.$file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { + $storage->unlink('/'.$file); + } } } } @@ -94,6 +96,9 @@ class OC_Cache_File{ if($storage and $storage->is_dir('/')) { $now = time(); $dh=$storage->opendir('/'); + if(!is_resource($dh)) { + return null; + } while (($file = readdir($dh)) !== false) { if($file!='.' and $file!='..') { $mtime = $storage->filemtime('/'.$file); diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php index 2fbd8ca3edb..c0bd8e45f39 100644 --- a/lib/cache/fileglobal.php +++ b/lib/cache/fileglobal.php @@ -69,9 +69,11 @@ class OC_Cache_FileGlobal{ $prefix = $this->fixKey($prefix); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); - while (($file = readdir($dh)) !== false) { - if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { - unlink($cache_dir.$file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { + unlink($cache_dir.$file); + } } } } @@ -88,11 +90,13 @@ class OC_Cache_FileGlobal{ $cache_dir = self::getCacheDir(); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); - while (($file = readdir($dh)) !== false) { - if($file!='.' and $file!='..') { - $mtime = filemtime($cache_dir.$file); - if ($mtime < $now) { - unlink($cache_dir.$file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if($file!='.' and $file!='..') { + $mtime = filemtime($cache_dir.$file); + if ($mtime < $now) { + unlink($cache_dir.$file); + } } } } diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php index b298813a202..acff45ed5e2 100644 --- a/lib/connector/sabre/objecttree.php +++ b/lib/connector/sabre/objecttree.php @@ -88,11 +88,13 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { } else { Filesystem::mkdir($destination); $dh = Filesystem::opendir($source); - while (($subnode = readdir($dh)) !== false) { + if(is_resource($dh)) { + while (($subnode = readdir($dh)) !== false) { - if ($subnode == '.' || $subnode == '..') continue; - $this->copy($source . '/' . $subnode, $destination . '/' . $subnode); + if ($subnode == '.' || $subnode == '..') continue; + $this->copy($source . '/' . $subnode, $destination . '/' . $subnode); + } } } diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 87fa7c1365a..9d180820e9d 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -159,20 +159,22 @@ class Scanner extends BasicEmitter { $newChildren = array(); if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) { \OC_DB::beginTransaction(); - while (($file = readdir($dh)) !== false) { - $child = ($path) ? $path . '/' . $file : $file; - if (!Filesystem::isIgnoredDir($file)) { - $newChildren[] = $file; - $data = $this->scanFile($child, $reuse, true); - if ($data) { - if ($data['size'] === -1) { - if ($recursive === self::SCAN_RECURSIVE) { - $childQueue[] = $child; - } else { - $size = -1; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + $child = ($path) ? $path . '/' . $file : $file; + if (!Filesystem::isIgnoredDir($file)) { + $newChildren[] = $file; + $data = $this->scanFile($child, $reuse, true); + if ($data) { + if ($data['size'] === -1) { + if ($recursive === self::SCAN_RECURSIVE) { + $childQueue[] = $child; + } else { + $size = -1; + } + } else if ($size !== -1) { + $size += $data['size']; } - } else if ($size !== -1) { - $size += $data['size']; } } } diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 01560f34fde..a5b79f0e967 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -142,13 +142,15 @@ abstract class Common implements \OC\Files\Storage\Storage { return false; } else { $directoryHandle = $this->opendir($directory); - while (($contents = readdir($directoryHandle)) !== false) { - if (!\OC\Files\Filesystem::isIgnoredDir($contents)) { - $path = $directory . '/' . $contents; - if ($this->is_dir($path)) { - $this->deleteAll($path); - } else { - $this->unlink($path); + if(is_resource($directoryHandle)) { + while (($contents = readdir($directoryHandle)) !== false) { + if (!\OC\Files\Filesystem::isIgnoredDir($contents)) { + $path = $directory . '/' . $contents; + if ($this->is_dir($path)) { + $this->deleteAll($path); + } else { + $this->unlink($path); + } } } } @@ -224,7 +226,8 @@ abstract class Common implements \OC\Files\Storage\Storage { } private function addLocalFolder($path, $target) { - if ($dh = $this->opendir($path)) { + $dh = $this->opendir($path); + if(is_resource($dh)) { while (($file = readdir($dh)) !== false) { if ($file !== '.' and $file !== '..') { if ($this->is_dir($path . '/' . $file)) { @@ -242,7 +245,7 @@ abstract class Common implements \OC\Files\Storage\Storage { protected function searchInDir($query, $dir = '') { $files = array(); $dh = $this->opendir($dir); - if ($dh) { + if (is_resource($dh)) { while (($item = readdir($dh)) !== false) { if ($item == '.' || $item == '..') continue; if (strstr(strtolower($item), strtolower($query)) !== false) { diff --git a/lib/files/view.php b/lib/files/view.php index 8aee12bf6fe..14de92c2005 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -500,9 +500,11 @@ class View { } else { if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) { $result = $this->mkdir($path2); - while (($file = readdir($dh)) !== false) { - if (!Filesystem::isIgnoredDir($file)) { - $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if (!Filesystem::isIgnoredDir($file)) { + $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); + } } } } else { diff --git a/lib/installer.php b/lib/installer.php index b9684eaeea0..607e6da7265 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -107,10 +107,12 @@ class OC_Installer{ if(!is_file($extractDir.'/appinfo/info.xml')) { //try to find it in a subdir $dh=opendir($extractDir); - while (($folder = readdir($dh)) !== false) { - if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) { - if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) { - $extractDir.='/'.$folder; + if(is_resource($dh)) { + while (($folder = readdir($dh)) !== false) { + if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) { + if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) { + $extractDir.='/'.$folder; + } } } } -- cgit v1.2.3 From 68dce9dde569a039da68cd2c1244ca89984aba34 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 4 Sep 2013 21:22:36 +0200 Subject: fixing style, var name & PHPDoc --- core/avatar/controller.php | 6 ++++-- lib/avatar.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 5264327b641..50ec50f19a5 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -72,12 +72,14 @@ class OC_Core_Avatar_Controller { } else { $l = new \OC_L10n('core'); $type = substr($image->mimeType(), -3); - if ($type === 'peg') { $type = 'jpg'; } + if ($type === 'peg') { + $type = 'jpg'; + } if ($type !== 'jpg' && $type !== 'png') { \OC_JSON::error(array("data" => array("message" => $l->t("Unknown filetype")) )); } - if (!$img->valid()) { + if (!$image->valid()) { \OC_JSON::error(array("data" => array("message" => $l->t("Invalid image")) )); } } diff --git a/lib/avatar.php b/lib/avatar.php index 9b2a7fe07cf..5f73a9bf220 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -15,7 +15,7 @@ class OC_Avatar { * @brief get the users avatar * @param $user string which user to get the avatar for * @param $size integer size in px of the avatar, defaults to 64 - * @return mixed \OC_Image containing the avatar or false if there's no image + * @return boolean|\OC_Image containing the avatar or false if there's no image */ public function get ($user, $size = 64) { $view = new \OC\Files\View('/'.$user); -- cgit v1.2.3 From b643c02bd5b6bdf7e1dbbc549ce2a089a009fbc8 Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 4 Sep 2013 22:13:59 +0200 Subject: Fix some bugs and remove \OCP\Avatar for now --- core/avatar/controller.php | 12 ++++++------ lib/public/avatar.php | 12 ------------ 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 lib/public/avatar.php (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 50ec50f19a5..d0edde50647 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -33,7 +33,7 @@ class OC_Core_Avatar_Controller { if ($image instanceof \OC_Image) { \OC_Response::setETagHeader(crc32($image->data())); $image->show(); - } elseif ($image === false) { + } else { \OC_JSON::success(array('user' => $user, 'size' => $size)); } } @@ -45,9 +45,7 @@ class OC_Core_Avatar_Controller { $path = stripslashes($_POST['path']); $view = new \OC\Files\View('/'.$user.'/files'); $newAvatar = $view->file_get_contents($path); - } - - if (!empty($_FILES)) { + } elseif (!empty($_FILES)) { $files = $_FILES['files']; if ( $files['error'][0] === 0 && @@ -57,6 +55,10 @@ class OC_Core_Avatar_Controller { $newAvatar = file_get_contents($files['tmp_name'][0]); unlink($files['tmp_name'][0]); } + } else { + $l = new \OC_L10n('core'); + \OC_JSON::error(array("data" => array("message" => $l->t("No image or file provided")) )); + return; } try { @@ -101,8 +103,6 @@ class OC_Core_Avatar_Controller { } public static function getTmpAvatar($args) { - $user = OC_User::getUser(); - $tmpavatar = \OC_Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); diff --git a/lib/public/avatar.php b/lib/public/avatar.php deleted file mode 100644 index 6da8e83a9af..00000000000 --- a/lib/public/avatar.php +++ /dev/null @@ -1,12 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OCP; - -class Avatar extends \OC_Avatar { -} -- cgit v1.2.3 From 7618cf3005f8bda8375183010711a9a2cdfb1fea Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 4 Sep 2013 23:45:11 +0200 Subject: adding public interface for preview --- lib/preview.php | 5 ++++- lib/previewmanager.php | 38 ++++++++++++++++++++++++++++++++++++++ lib/public/ipreview.php | 35 +++++++++++++++++++++++++++++++++++ lib/public/iservercontainer.php | 6 ++++++ lib/public/preview.php | 34 ---------------------------------- lib/server.php | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+), 35 deletions(-) create mode 100755 lib/previewmanager.php create mode 100644 lib/public/ipreview.php delete mode 100644 lib/public/preview.php (limited to 'lib') diff --git a/lib/preview.php b/lib/preview.php index b40ba191fba..266f7795f12 100755 --- a/lib/preview.php +++ b/lib/preview.php @@ -42,6 +42,9 @@ class Preview { private $scalingup; //preview images object + /** + * @var \OC_Image + */ private $preview; //preview providers @@ -624,4 +627,4 @@ class Preview { } return false; } -} \ No newline at end of file +} diff --git a/lib/previewmanager.php b/lib/previewmanager.php new file mode 100755 index 00000000000..ac9a866a75b --- /dev/null +++ b/lib/previewmanager.php @@ -0,0 +1,38 @@ +getPreview(); + } + + /** + * @brief returns true if the passed mime type is supported + * @param string $mimeType + * @return boolean + */ + function isMimeSupported($mimeType = '*') + { + return \OC\Preview::isMimeSupported($mimeType); + } +} diff --git a/lib/public/ipreview.php b/lib/public/ipreview.php new file mode 100644 index 00000000000..b01e7f5b539 --- /dev/null +++ b/lib/public/ipreview.php @@ -0,0 +1,35 @@ +registerService('ContactsManager', function($c){ return new ContactsManager(); }); + $this->registerService('Request', function($c){ + $params = array(); + + // we json decode the body only in case of content type json + if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) { + $params = json_decode(file_get_contents('php://input'), true); + $params = is_array($params) ? $params: array(); + } + + return new Request( + array( + 'get' => $_GET, + 'post' => $_POST, + 'files' => $_FILES, + 'server' => $_SERVER, + 'env' => $_ENV, + 'session' => $_SESSION, + 'cookies' => $_COOKIE, + 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) + ? $_SERVER['REQUEST_METHOD'] + : null, + 'params' => $params, + 'urlParams' => $c['urlParams'] + ) + ); + }); + $this->registerService('PreviewManager', function($c){ + return new PreviewManager(); + }); } /** @@ -37,4 +67,14 @@ class Server extends SimpleContainer implements IServerContainer { { return $this->query('Request'); } + + /** + * Returns the preview manager which can create preview images for a given file + * + * @return \OCP\IPreview + */ + function getPreviewManager() + { + return $this->query('PreviewManager'); + } } -- cgit v1.2.3 From 2954db165b92d5bbc463e732a1691c3df9e1e860 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 5 Sep 2013 09:53:35 +0200 Subject: use avconv instead of ffmpeg --- lib/preview/movies.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/preview/movies.php b/lib/preview/movies.php index e2a1b8edddc..c318137ff0e 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -9,10 +9,10 @@ namespace OC\Preview; $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); -$whichFFMPEG = shell_exec('which ffmpeg'); -$isFFMPEGAvailable = !empty($whichFFMPEG); +$whichAVCONV = shell_exec('which avconv'); +$isAVCONVAvailable = !empty($whichAVCONV); -if($isShellExecEnabled && $isFFMPEGAvailable) { +if($isShellExecEnabled && $isAVCONVAvailable) { class Movie extends Provider { @@ -30,7 +30,7 @@ if($isShellExecEnabled && $isFFMPEGAvailable) { file_put_contents($absPath, $firstmb); //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath; - $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmpPath); + $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath); shell_exec($cmd); -- cgit v1.2.3 From c01675de5d6650c7b1cd0571d8c313f21d13c33c Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 5 Sep 2013 11:58:57 +0200 Subject: more is_resource checks before readdir --- apps/files_encryption/lib/util.php | 121 ++++++++++++++++--------------- apps/files_external/lib/config.php | 2 +- apps/files_sharing/lib/sharedstorage.php | 3 +- lib/files/storage/mappedlocal.php | 18 +++-- lib/helper.php | 32 ++++---- lib/migration/content.php | 3 +- 6 files changed, 94 insertions(+), 85 deletions(-) (limited to 'lib') diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index b8d68623493..8a7b6f40cba 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -329,72 +329,73 @@ class Util { $this->view->is_dir($directory) && $handle = $this->view->opendir($directory) ) { - - while (false !== ($file = readdir($handle))) { - - if ( - $file !== "." - && $file !== ".." - ) { - - $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file); - $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath); - - // If the path is a directory, search - // its contents - if ($this->view->is_dir($filePath)) { - - $this->findEncFiles($filePath, $found); - - // If the path is a file, determine - // its encryption status - } elseif ($this->view->is_file($filePath)) { - - // Disable proxies again, some- - // where they got re-enabled :/ - \OC_FileProxy::$enabled = false; - - $isEncryptedPath = $this->isEncryptedPath($filePath); - // If the file is encrypted - // NOTE: If the userId is - // empty or not set, file will - // detected as plain - // NOTE: This is inefficient; - // scanning every file like this - // will eat server resources :( - if ( - Keymanager::getFileKey($this->view, $this->userId, $relPath) - && $isEncryptedPath - ) { - - $found['encrypted'][] = array( - 'name' => $file, - 'path' => $filePath - ); - - // If the file uses old - // encryption system - } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) { - - $found['legacy'][] = array( - 'name' => $file, - 'path' => $filePath - ); - - // If the file is not encrypted - } else { - - $found['plain'][] = array( - 'name' => $file, - 'path' => $relPath - ); + if(is_resource($handle)) { + while (false !== ($file = readdir($handle))) { + + if ( + $file !== "." + && $file !== ".." + ) { + + $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file); + $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath); + + // If the path is a directory, search + // its contents + if ($this->view->is_dir($filePath)) { + + $this->findEncFiles($filePath, $found); + + // If the path is a file, determine + // its encryption status + } elseif ($this->view->is_file($filePath)) { + + // Disable proxies again, some- + // where they got re-enabled :/ + \OC_FileProxy::$enabled = false; + + $isEncryptedPath = $this->isEncryptedPath($filePath); + // If the file is encrypted + // NOTE: If the userId is + // empty or not set, file will + // detected as plain + // NOTE: This is inefficient; + // scanning every file like this + // will eat server resources :( + if ( + Keymanager::getFileKey($this->view, $this->userId, $relPath) + && $isEncryptedPath + ) { + + $found['encrypted'][] = array( + 'name' => $file, + 'path' => $filePath + ); + + // If the file uses old + // encryption system + } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) { + + $found['legacy'][] = array( + 'name' => $file, + 'path' => $filePath + ); + + // If the file is not encrypted + } else { + + $found['plain'][] = array( + 'name' => $file, + 'path' => $relPath + ); + + } } } } - } \OC_FileProxy::$enabled = true; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 1935740cd2e..659959e662e 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -378,7 +378,7 @@ class OC_Mount_Config { } $result = array(); $handle = opendir($path); - if ( ! $handle) { + if(!is_resource($handle)) { return array(); } while (false !== ($file = readdir($handle))) { diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index d91acbbb2bd..257da89c84e 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -221,7 +221,8 @@ class Shared extends \OC\Files\Storage\Common { public function filemtime($path) { if ($path == '' || $path == '/') { $mtime = 0; - if ($dh = $this->opendir($path)) { + $dh = $this->opendir($path); + if(is_resource($dh)) { while (($filename = readdir($dh)) !== false) { $tempmtime = $this->filemtime($filename); if ($tempmtime > $mtime) { diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php index fbf1b4ebf96..ba5ac4191c5 100644 --- a/lib/files/storage/mappedlocal.php +++ b/lib/files/storage/mappedlocal.php @@ -65,16 +65,18 @@ class MappedLocal extends \OC\Files\Storage\Common{ $logicalPath = $this->mapper->physicalToLogic($physicalPath); $dh = opendir($physicalPath); - while (($file = readdir($dh)) !== false) { - if ($file === '.' or $file === '..') { - continue; - } + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file === '.' or $file === '..') { + continue; + } - $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file); + $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file); - $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); - $file = $this->stripLeading($file); - $files[]= $file; + $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); + $file = $this->stripLeading($file); + $files[]= $file; + } } \OC\Files\Stream\Dir::register('local-win32'.$path, $files); diff --git a/lib/helper.php b/lib/helper.php index 5fb8fed3459..0af7f6f0394 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -341,17 +341,19 @@ class OC_Helper { if (!is_dir($path)) return chmod($path, $filemode); $dh = opendir($path); - while (($file = readdir($dh)) !== false) { - if ($file != '.' && $file != '..') { - $fullpath = $path . '/' . $file; - if (is_link($fullpath)) - return false; - elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode)) - return false; elseif (!self::chmodr($fullpath, $filemode)) - return false; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file != '.' && $file != '..') { + $fullpath = $path . '/' . $file; + if (is_link($fullpath)) + return false; + elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode)) + return false; elseif (!self::chmodr($fullpath, $filemode)) + return false; + } } + closedir($dh); } - closedir($dh); if (@chmod($path, $filemode)) return true; else @@ -649,9 +651,11 @@ class OC_Helper { // if oc-noclean is empty delete it $isTmpDirNoCleanEmpty = true; $tmpDirNoClean = opendir($tmpDirNoCleanName); - while (false !== ($file = readdir($tmpDirNoClean))) { - if (!\OC\Files\Filesystem::isIgnoredDir($file)) { - $isTmpDirNoCleanEmpty = false; + if(is_resource($tmpDirNoClean)) { + while (false !== ($file = readdir($tmpDirNoClean))) { + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { + $isTmpDirNoCleanEmpty = false; + } } } if ($isTmpDirNoCleanEmpty) { @@ -694,7 +698,7 @@ class OC_Helper { $newpath = $path . '/' . $filename; if ($view->file_exists($newpath)) { if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) { - //Replace the last "(number)" with "(number+1)" + //Replace the last "(number)" with "(number+1)" $last_match = count($matches[0]) - 1; $counter = $matches[1][$last_match][0] + 1; $offset = $matches[0][$last_match][1]; @@ -705,7 +709,7 @@ class OC_Helper { } do { if ($offset) { - //Replace the last "(number)" with "(number+1)" + //Replace the last "(number)" with "(number+1)" $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length); } else { $newname = $name . ' (' . $counter . ')'; diff --git a/lib/migration/content.php b/lib/migration/content.php index 2d8268a1d74..4413d722731 100644 --- a/lib/migration/content.php +++ b/lib/migration/content.php @@ -191,7 +191,8 @@ class OC_Migration_Content{ if( !file_exists( $dir ) ) { return false; } - if ($dirhandle = opendir($dir)) { + $dirhandle = opendir($dir); + if(is_resource($dirhandle)) { while (false !== ( $file = readdir($dirhandle))) { if (( $file != '.' ) && ( $file != '..' )) { -- cgit v1.2.3 From 0527fb05ad4106db199bf3937b753563061c39bf Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 5 Sep 2013 07:37:32 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ca.php | 1 + apps/files/l10n/es.php | 8 ++-- apps/files/l10n/et_EE.php | 1 + apps/files/l10n/gl.php | 1 + apps/files/l10n/pl.php | 8 ++-- apps/files_encryption/l10n/es.php | 2 + apps/files_sharing/l10n/es.php | 2 +- apps/files_trashbin/l10n/es.php | 4 +- apps/files_trashbin/l10n/pl.php | 4 +- apps/files_versions/l10n/es.php | 2 +- apps/user_ldap/l10n/es.php | 11 +++++ apps/user_ldap/l10n/fr.php | 11 +++++ apps/user_webdavauth/l10n/es.php | 4 +- apps/user_webdavauth/l10n/fr.php | 1 - core/l10n/ca.php | 6 +++ core/l10n/es.php | 39 ++++++++++------- core/l10n/pl.php | 15 +++++-- core/l10n/tr.php | 6 +++ l10n/ca/core.po | 40 +++++++++--------- l10n/ca/files.po | 8 ++-- l10n/es/core.po | 83 +++++++++++++++++++------------------ l10n/es/files.po | 19 +++++---- l10n/es/files_encryption.po | 16 +++---- l10n/es/files_sharing.po | 12 +++--- l10n/es/files_trashbin.po | 32 +++++++------- l10n/es/files_versions.po | 11 ++--- l10n/es/lib.po | 29 ++++++------- l10n/es/settings.po | 57 ++++++++++++------------- l10n/es/user_ldap.po | 29 ++++++------- l10n/es/user_webdavauth.po | 11 ++--- l10n/et_EE/files.po | 8 ++-- l10n/fr/lib.po | 43 +++++++++---------- l10n/fr/user_ldap.po | 29 ++++++------- l10n/fr/user_webdavauth.po | 8 ++-- l10n/gl/files.po | 8 ++-- l10n/pl/core.po | 66 ++++++++++++++--------------- l10n/pl/files.po | 29 ++++++------- l10n/pl/files_trashbin.po | 26 ++++++------ l10n/pl/lib.po | 78 +++++++++++++++++----------------- l10n/pl/settings.po | 56 ++++++++++++------------- l10n/templates/core.pot | 24 +++++------ 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_trashbin.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 | 41 +++++++++--------- lib/l10n/es.php | 11 +++-- lib/l10n/fr.php | 18 ++++++++ lib/l10n/pl.php | 22 ++++++++-- settings/l10n/es.php | 24 +++++++---- settings/l10n/pl.php | 14 +++++++ 57 files changed, 560 insertions(+), 438 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 648ffce79d6..eb724d19548 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfés", "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), +"{dirs} and {files}" => "{dirs} i {files}", "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), "files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 7a5785577af..ce92ff8f187 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}", "undo" => "deshacer", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n carpetas"), +"_%n file_::_%n files_" => array("","%n archivos"), +"{dirs} and {files}" => "{dirs} y {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), "files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", "File name cannot be empty." => "El nombre de archivo no puede estar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ", "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!", "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.", "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.", "Name" => "Nombre", "Size" => "Tamaño", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 5a2bb437d39..52ba1191706 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "tagasi", "_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), "_%n file_::_%n files_" => array("%n fail","%n faili"), +"{dirs} and {files}" => "{dirs} ja {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), "files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 6ec1816308a..01a6b54f842 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfacer", "_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), +"{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), "files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 4b22b080b28..d8edf7173a8 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "anuluj", "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}", "undo" => "cofnij", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), -"_Uploading %n file_::_Uploading %n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"), +"_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"), +"{dirs} and {files}" => "{katalogi} and {pliki}", +"_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"), "files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", "File name cannot be empty." => "Nazwa pliku nie może być pusta.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.", "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!", "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.", "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.", "Name" => "Nazwa", "Size" => "Rozmiar", diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index 8341bafc9fd..2d644708c59 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -10,6 +10,8 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.", "Missing requirements." => "Requisitos incompletos.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.", +"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:", "Saving..." => "Guardando...", "Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.", "You can unlock your private key in your " => "Puede desbloquear su clave privada en su", diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 1f238d083fb..e163da766f3 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -3,7 +3,7 @@ $TRANSLATIONS = array( "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", -"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.", +"Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.", "Reasons might be:" => "Las causas podrían ser:", "the item was removed" => "el elemento fue eliminado", "the link expired" => "el enlace expiró", diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php index 956d89ae688..a5639c2c714 100644 --- a/apps/files_trashbin/l10n/es.php +++ b/apps/files_trashbin/l10n/es.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Eliminar permanentemente", "Name" => "Nombre", "Deleted" => "Eliminado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"), +"_%n file_::_%n files_" => array("%n archivo","%n archivos"), "restored" => "recuperado", "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!", "Restore" => "Recuperar", diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php index e8295e2ff03..c838a6b956c 100644 --- a/apps/files_trashbin/l10n/pl.php +++ b/apps/files_trashbin/l10n/pl.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Trwale usuń", "Name" => "Nazwa", "Deleted" => "Usunięte", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("","","%n katalogów"), +"_%n file_::_%n files_" => array("","","%n plików"), "restored" => "przywrócony", "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!", "Restore" => "Przywróć", diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php index a6031698e06..b7acc376978 100644 --- a/apps/files_versions/l10n/es.php +++ b/apps/files_versions/l10n/es.php @@ -3,7 +3,7 @@ $TRANSLATIONS = array( "Could not revert: %s" => "No se puede revertir: %s", "Versions" => "Revisiones", "Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisión {timestamp}.", -"More versions..." => "Más...", +"More versions..." => "Más versiones...", "No other versions available" => "No hay otras versiones disponibles", "Restore" => "Recuperar" ); diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index e5994273635..4f37d5177a7 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "La prueba de conexión falló", "Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?", "Confirm Deletion" => "Confirmar eliminación", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Advertencia: El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.", "Server configuration" => "Configuración del Servidor", "Add Server Configuration" => "Agregar configuracion del servidor", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Contraseña", "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.", "User Login Filter" => "Filtro de inicio de sesión de usuario", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"", "User List Filter" => "Lista de filtros de usuario", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"", "Group Filter" => "Filtro de grupo", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"", "Connection Settings" => "Configuración de conexión", "Configuration Active" => "Configuracion activa", "When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.", "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)", "Disable Main Server" => "Deshabilitar servidor principal", +"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.", "Use TLS" => "Usar TLS", "Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.", "Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Cache TTL", "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.", "Directory Settings" => "Configuracion de directorio", "User Display Name Field" => "Campo de nombre de usuario a mostrar", +"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.", "Base User Tree" => "Árbol base de usuario", "One User Base DN per line" => "Un DN Base de Usuario por línea", "User Search Attributes" => "Atributos de la busqueda de usuario", "Optional; one attribute per line" => "Opcional; un atributo por linea", "Group Display Name Field" => "Campo de nombre de grupo a mostrar", +"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.", "Base Group Tree" => "Árbol base de grupo", "One Group Base DN per line" => "Un DN Base de Grupo por línea", "Group Search Attributes" => "Atributos de busqueda de grupo", @@ -64,10 +72,13 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.", "Internal Username" => "Nombre de usuario interno", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.", "Internal Username Attribute:" => "Atributo Nombre de usuario Interno:", "Override UUID detection" => "Sobrescribir la detección UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.", "UUID Attribute:" => "Atributo UUID:", "Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.", "Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP", "Test Configuration" => "Configuración de prueba", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 0c7d3ad078f..8b6027b81e6 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "Test de connexion échoué", "Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?", "Confirm Deletion" => "Confirmer la suppression", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Avertissement : Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Attention : Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.", "Server configuration" => "Configuration du serveur", "Add Server Configuration" => "Ajouter une configuration du serveur", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Mot de passe", "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.", "User Login Filter" => "Modèle d'authentification utilisateurs", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"", "User List Filter" => "Filtre d'utilisateurs", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"", "Group Filter" => "Filtre de groupes", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"", "Connection Settings" => "Paramètres de connexion", "Configuration Active" => "Configuration active", "When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal.", "Backup (Replica) Port" => "Port du serveur de backup (réplique)", "Disable Main Server" => "Désactiver le serveur principal", +"Only connect to the replica server." => "Se connecter uniquement au serveur de replica.", "Use TLS" => "Utiliser TLS", "Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).", "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)", "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.", "Cache Time-To-Live" => "Durée de vie du cache", "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.", "Directory Settings" => "Paramètres du répertoire", "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur", +"The LDAP attribute to use to generate the user's display name." => "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.", "Base User Tree" => "DN racine de l'arbre utilisateurs", "One User Base DN per line" => "Un DN racine utilisateur par ligne", "User Search Attributes" => "Recherche des attributs utilisateur", "Optional; one attribute per line" => "Optionnel, un attribut par ligne", "Group Display Name Field" => "Champ \"nom d'affichage\" du groupe", +"The LDAP attribute to use to generate the groups's display name." => "L'attribut LDAP utilisé pour générer le nom de groupe affiché.", "Base Group Tree" => "DN racine de l'arbre groupes", "One Group Base DN per line" => "Un DN racine groupe par ligne", "Group Search Attributes" => "Recherche des attributs du groupe", @@ -64,10 +72,13 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ", "Internal Username" => "Nom d'utilisateur interne", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.", "Internal Username Attribute:" => "Nom d'utilisateur interne:", "Override UUID detection" => "Surcharger la détection d'UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.", "UUID Attribute:" => "Attribut UUID :", "Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", "Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP", "Test Configuration" => "Tester la configuration", diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php index cd8ec6659a4..951aabe24ae 100644 --- a/apps/user_webdavauth/l10n/es.php +++ b/apps/user_webdavauth/l10n/es.php @@ -1,7 +1,7 @@ "Autenticación de WevDAV", +"WebDAV Authentication" => "Autenticación mediante WevDAV", "Address: " => "Dirección:", -"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php index 709fa53dac5..b11e3d5a026 100644 --- a/apps/user_webdavauth/l10n/fr.php +++ b/apps/user_webdavauth/l10n/fr.php @@ -1,6 +1,5 @@ "Authentification WebDAV", "Address: " => "Adresse :", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." ); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index a77924b1218..76973490125 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s ha compartit »%s« amb tu", "group" => "grup", +"Turned on maintenance mode" => "Activat el mode de manteniment", +"Turned off maintenance mode" => "Desactivat el mode de manteniment", +"Updated database" => "Actualitzada la base de dades", +"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...", +"Updated filecache" => "Actualitzada la memòria de cau dels fitxers", +"... %d%% done ..." => "... %d%% fet ...", "Category type not provided." => "No s'ha especificat el tipus de categoria.", "No category to add?" => "No voleu afegir cap categoria?", "This category already exists: %s" => "Aquesta categoria ja existeix: %s", diff --git a/core/l10n/es.php b/core/l10n/es.php index 077f677e972..9e34e6f4ac3 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,7 +1,13 @@ "%s compatido »%s« contigo", +"%s shared »%s« with you" => "%s ha compatido »%s« contigo", "group" => "grupo", +"Turned on maintenance mode" => "Modo mantenimiento activado", +"Turned off maintenance mode" => "Modo mantenimiento desactivado", +"Updated database" => "Base de datos actualizada", +"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...", +"Updated filecache" => "Caché de archivos actualizada", +"... %d%% done ..." => "... %d%% hecho ...", "Category type not provided." => "Tipo de categoría no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", @@ -30,17 +36,17 @@ $TRANSLATIONS = array( "November" => "Noviembre", "December" => "Diciembre", "Settings" => "Ajustes", -"seconds ago" => "hace segundos", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"seconds ago" => "segundos antes", +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), -"months ago" => "hace meses", +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), +"months ago" => "meses antes", "last year" => "el año pasado", -"years ago" => "hace años", +"years ago" => "años antes", "Choose" => "Seleccionar", "Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos", "Yes" => "Sí", @@ -49,12 +55,12 @@ $TRANSLATIONS = array( "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", -"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!", +"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!", "Shared" => "Compartido", "Share" => "Compartir", -"Error while sharing" => "Error mientras comparte", -"Error while unsharing" => "Error mientras se deja de compartir", -"Error while changing permissions" => "Error mientras se cambia permisos", +"Error while sharing" => "Error al compartir", +"Error while unsharing" => "Error al dejar de compartir", +"Error while changing permissions" => "Error al cambiar permisos", "Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}", "Shared with you by {owner}" => "Compartido contigo por {owner}", "Share with" => "Compartir con", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "Correo electrónico enviado", "The update was unsuccessful. Please report this issue to the ownCloud community." => "La actualización ha fracasado. Por favor, informe de este problema a la Comunidad de ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", +"%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico.
      Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado.
      Si no está allí, pregunte a su administrador local.", "Request failed!
      Did you make sure your email/username was right?" => "La petición ha fallado!
      ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?", @@ -101,9 +108,9 @@ $TRANSLATIONS = array( "Apps" => "Aplicaciones", "Admin" => "Administración", "Help" => "Ayuda", -"Access forbidden" => "Acceso prohibido", +"Access forbidden" => "Acceso denegado", "Cloud not found" => "No se encuentra la nube", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!", "Edit categories" => "Editar categorías", "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", @@ -127,13 +134,13 @@ $TRANSLATIONS = array( "%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.", "Log out" => "Salir", "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!", -"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!", +"If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!", "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.", "Lost your password?" => "¿Ha perdido su contraseña?", "remember" => "recordar", "Log in" => "Entrar", "Alternative Logins" => "Inicios de sesión alternativos", -"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "Oye,

      sólo te hago saber que %s compartido %s contigo,
      \nMíralo!

      Disfrutalo!", +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "Hey,

      sólo te hago saber que %s ha compartido %s contigo.
      ¡Echa un ojo!

      ¡Un saludo!", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 48f6dff6184..2162de0e48c 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą", "group" => "grupa", +"Turned on maintenance mode" => "Włączony tryb konserwacji", +"Turned off maintenance mode" => "Wyłączony tryb konserwacji", +"Updated database" => "Zaktualizuj bazę", +"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...", +"Updated filecache" => "Zaktualizuj filecache", +"... %d%% done ..." => "... %d%% udane ...", "Category type not provided." => "Nie podano typu kategorii.", "No category to add?" => "Brak kategorii do dodania?", "This category already exists: %s" => "Ta kategoria już istnieje: %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "Grudzień", "Settings" => "Ustawienia", "seconds ago" => "sekund temu", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"), +"_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"), "today" => "dziś", "yesterday" => "wczoraj", -"_%n day ago_::_%n days ago_" => array("","",""), +"_%n day ago_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"), "last month" => "w zeszłym miesiącu", -"_%n month ago_::_%n months ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "months ago" => "miesięcy temu", "last year" => "w zeszłym roku", "years ago" => "lat temu", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "E-mail wysłany", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem spoleczności ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", +"%s password reset" => "%s reset hasła", "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email.
      Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem.
      Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.", "Request failed!
      Did you make sure your email/username was right?" => "Żądanie niepowiodło się!
      Czy Twój email/nazwa użytkownika są poprawne?", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 8b6c261d64c..267e07189c7 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu", "group" => "grup", +"Turned on maintenance mode" => "Bakım kipi etkinleştirildi", +"Turned off maintenance mode" => "Bakım kipi kapatıldı", +"Updated database" => "Veritabanı güncellendi", +"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.", +"Updated filecache" => "Dosya önbelleği güncellendi", +"... %d%% done ..." => "%%%d tamamlandı ...", "Category type not provided." => "Kategori türü girilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: %s" => "Bu kategori zaten mevcut: %s", diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6585814d749..bdbf14d4d57 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"Last-Translator: rogerc\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" @@ -30,28 +30,28 @@ msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Activat el mode de manteniment" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Desactivat el mode de manteniment" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Actualitzada la base de dades" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualitzant la memòria de cau del fitxers, això pot trigar molt..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Actualitzada la memòria de cau dels fitxers" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% fet ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,55 +172,55 @@ msgstr "Desembre" msgid "Settings" msgstr "Configuració" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segons enrere" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fa %n minut" msgstr[1] "fa %n minuts" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fa %n hora" msgstr[1] "fa %n hores" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "avui" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ahir" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fa %n dies" msgstr[1] "fa %n dies" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "el mes passat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fa %n mes" msgstr[1] "fa %n mesos" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mesos enrere" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "l'any passat" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anys enrere" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index ecc26a9b132..9dc1d5ffcc6 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"Last-Translator: rogerc\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" @@ -171,7 +171,7 @@ msgstr[1] "%n fitxers" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} i {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/es/core.po b/l10n/es/core.po index 4a006b413d6..8532b677a0e 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -8,6 +8,7 @@ # I Robot , 2013 # msoko , 2013 # pablomillaquen , 2013 +# Korrosivo , 2013 # saskarip , 2013 # saskarip , 2013 # iGerli , 2013 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:40+0000\n" +"Last-Translator: Korrosivo \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" @@ -29,7 +30,7 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "%s shared »%s« with you" -msgstr "%s compatido »%s« contigo" +msgstr "%s ha compatido »%s« contigo" #: ajax/share.php:227 msgid "group" @@ -37,28 +38,28 @@ msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Modo mantenimiento activado" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Modo mantenimiento desactivado" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de datos actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Caché de archivos actualizada" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% hecho ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -179,57 +180,57 @@ msgstr "Diciembre" msgid "Settings" msgstr "Ajustes" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" -msgstr "hace segundos" +msgstr "segundos antes" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n minuto" +msgstr[1] "Hace %n minutos" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n hora" +msgstr[1] "Hace %n horas" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoy" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ayer" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n día" +msgstr[1] "Hace %n días" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "el mes pasado" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n mes" +msgstr[1] "Hace %n meses" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" -msgstr "hace meses" +msgstr "meses antes" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "el año pasado" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" -msgstr "hace años" +msgstr "años antes" #: js/oc-dialogs.js:123 msgid "Choose" @@ -270,7 +271,7 @@ msgstr "El nombre de la aplicación no está especificado." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "¡El fichero requerido {file} no está instalado!" +msgstr "¡El fichero {file} es necesario y no está instalado!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" @@ -282,15 +283,15 @@ msgstr "Compartir" #: js/share.js:131 js/share.js:683 msgid "Error while sharing" -msgstr "Error mientras comparte" +msgstr "Error al compartir" #: js/share.js:142 msgid "Error while unsharing" -msgstr "Error mientras se deja de compartir" +msgstr "Error al dejar de compartir" #: js/share.js:149 msgid "Error while changing permissions" -msgstr "Error mientras se cambia permisos" +msgstr "Error al cambiar permisos" #: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" @@ -414,7 +415,7 @@ msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s restablecer contraseña" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -494,7 +495,7 @@ msgstr "Ayuda" #: templates/403.php:12 msgid "Access forbidden" -msgstr "Acceso prohibido" +msgstr "Acceso denegado" #: templates/404.php:15 msgid "Cloud not found" @@ -509,7 +510,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!" +msgstr "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -621,7 +622,7 @@ msgstr "¡Inicio de sesión automático rechazado!" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!" +msgstr "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!" #: templates/login.php:12 msgid "Please change your password to secure your account again." @@ -648,7 +649,7 @@ msgstr "Inicios de sesión alternativos" msgid "" "Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" -msgstr "Oye,

      sólo te hago saber que %s compartido %s contigo,
      \nMíralo!

      Disfrutalo!" +msgstr "Hey,

      sólo te hago saber que %s ha compartido %s contigo.
      ¡Echa un ojo!

      ¡Un saludo!" #: templates/update.php:3 #, php-format diff --git a/l10n/es/files.po b/l10n/es/files.po index 150143b933d..5f5825ab799 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -7,14 +7,15 @@ # ggam , 2013 # mikelanabitarte , 2013 # qdneren , 2013 +# Korrosivo , 2013 # saskarip , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:10+0000\n" +"Last-Translator: Korrosivo \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" @@ -164,23 +165,23 @@ msgstr "deshacer" msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n carpetas" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n archivos" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} y {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Subiendo %n archivo" +msgstr[1] "Subiendo %n archivos" #: js/filelist.js:628 msgid "files uploading" @@ -212,7 +213,7 @@ msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos." #: js/files.js:245 msgid "" diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po index 7d0a9ee0236..e32866e3011 100644 --- a/l10n/es/files_encryption.po +++ b/l10n/es/files_encryption.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \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" @@ -68,20 +68,20 @@ msgid "" "files." msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Los siguientes usuarios no han sido configurados para el cifrado:" #: js/settings-admin.js:11 msgid "Saving..." diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 31ba6d42fae..42ee5e09a55 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" -"Last-Translator: Art O. Pal \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \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" @@ -33,7 +33,7 @@ msgstr "Enviar" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "Este enlace parece no funcionar más." +msgstr "Vaya, este enlace parece que no volverá a funcionar." #: templates/part.404.php:4 msgid "Reasons might be:" @@ -65,7 +65,7 @@ msgstr "%s compartió la carpeta %s contigo" msgid "%s shared the file %s with you" msgstr "%s compartió el fichero %s contigo" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Descargar" @@ -77,6 +77,6 @@ msgstr "Subir" msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "No hay vista previa disponible para" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index beb34a8115e..2f439a315fd 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:16+0000\n" +"Last-Translator: Korrosivo \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" @@ -29,43 +29,43 @@ msgstr "No se puede eliminar %s permanentemente" msgid "Couldn't restore %s" msgstr "No se puede restaurar %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "restaurar" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Error" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "eliminar archivo permanentemente" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n carpeta" +msgstr[1] "%n carpetas" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n archivo" +msgstr[1] "%n archivos" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "recuperado" diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po index 2c3194d6870..fa132a31fb7 100644 --- a/l10n/es/files_versions.po +++ b/l10n/es/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-13 09:11-0400\n" -"PO-Revision-Date: 2013-08-13 05:50+0000\n" -"Last-Translator: Rodrigo Rodríguez \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \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" @@ -33,12 +34,12 @@ msgstr "No se ha podido revertir {archivo} a revisión {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "Más..." +msgstr "Más versiones..." #: js/versions.js:116 msgid "No other versions available" msgstr "No hay otras versiones disponibles" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Recuperar" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 43f652d3a58..832f5589c97 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -5,14 +5,15 @@ # Translators: # Dharth , 2013 # pablomillaquen , 2013 +# Korrosivo , 2013 # xhiena , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 23:40+0000\n" -"Last-Translator: Dharth \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:30+0000\n" +"Last-Translator: Korrosivo \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" @@ -132,16 +133,16 @@ msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n, 2013 # pablomillaquen , 2013 # qdneren , 2013 +# Korrosivo , 2013 # saskarip , 2013 # scambra , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 08:01+0000\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 21:00+0000\n" "Last-Translator: eadeprado \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -35,7 +36,7 @@ msgstr "Error de autenticación" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "Su nombre fue cambiado." +msgstr "Su nombre de usuario ha sido cambiado." #: ajax/changedisplayname.php:34 msgid "Unable to change display name" @@ -91,53 +92,53 @@ msgstr "No se pudo eliminar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la aplicacion." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizado a {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactivar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Espere, por favor...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Error mientras se desactivaba la aplicación" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Error mientras se activaba la aplicación" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Actualizando...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Error mientras se actualizaba la aplicación" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Error" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizado" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." #: js/personal.js:172 msgid "Saving..." @@ -199,7 +200,7 @@ msgid "" "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 "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web." +msgstr "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web." #: templates/admin.php:29 msgid "Setup Warning" @@ -218,13 +219,13 @@ msgstr "Por favor, vuelva a comprobar las guías de instalación-licensed by " -msgstr "-licenciado por " +msgstr "-licencia otorgada por " #: templates/help.php:4 msgid "User Documentation" @@ -414,7 +415,7 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos" #: templates/personal.php:19 msgid "Show First Run Wizard again" -msgstr "Mostrar asistente para iniciar otra vez" +msgstr "Mostrar asistente para iniciar de nuevo" #: templates/personal.php:27 #, php-format @@ -467,7 +468,7 @@ msgstr "Idioma" #: templates/personal.php:98 msgid "Help translate" -msgstr "Ayúdnos a traducir" +msgstr "Ayúdanos a traducir" #: templates/personal.php:104 msgid "WebDAV" @@ -486,15 +487,15 @@ msgstr "Cifrado" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "La aplicación de cifrado no está activada, descifre sus archivos" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Contraseña de acceso" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Descifrar archivos" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index a823ac15748..3a30c965c33 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -6,14 +6,15 @@ # Agustin Ferrario , 2013 # ordenet , 2013 # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 # xhiena , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 17:10+0000\n" +"Last-Translator: Korrosivo \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" @@ -94,7 +95,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos." #: templates/settings.php:12 msgid "" @@ -159,7 +160,7 @@ msgstr "Filtro de inicio de sesión de usuario" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -169,7 +170,7 @@ msgstr "Lista de filtros de usuario" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -179,7 +180,7 @@ msgstr "Filtro de grupo" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -217,7 +218,7 @@ msgstr "Deshabilitar servidor principal" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Conectar sólo con el servidor de réplica." #: templates/settings.php:73 msgid "Use TLS" @@ -240,7 +241,7 @@ msgstr "Apagar la validación por certificado SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -260,7 +261,7 @@ msgstr "Campo de nombre de usuario a mostrar" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "El campo LDAP a usar para generar el nombre para mostrar del usuario." #: templates/settings.php:81 msgid "Base User Tree" @@ -284,7 +285,7 @@ msgstr "Campo de nombre de grupo a mostrar" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "El campo LDAP a usar para generar el nombre para mostrar del grupo." #: templates/settings.php:84 msgid "Base Group Tree" @@ -350,7 +351,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente." #: templates/settings.php:100 msgid "Internal Username Attribute:" @@ -369,7 +370,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -391,7 +392,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po index b880f91c7a9..a1d0cf3900a 100644 --- a/l10n/es/user_webdavauth.po +++ b/l10n/es/user_webdavauth.po @@ -7,14 +7,15 @@ # Art O. Pal , 2012 # pggx999 , 2012 # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 # saskarip , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-13 09:11-0400\n" -"PO-Revision-Date: 2013-08-13 05:50+0000\n" -"Last-Translator: Rodrigo Rodríguez \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:30+0000\n" +"Last-Translator: Korrosivo \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" @@ -24,7 +25,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "Autenticación de WevDAV" +msgstr "Autenticación mediante WevDAV" #: templates/settings.php:4 msgid "Address: " @@ -35,4 +36,4 @@ msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." +msgstr "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 79f5e340cfb..de1769914cc 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 05:50+0000\n" +"Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,7 +171,7 @@ msgstr[1] "%n faili" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} ja {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index bc0c4a9abbd..376d8982c16 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 # Cyril Glapa , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:44-0400\n" -"PO-Revision-Date: 2013-09-03 09:30+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:50+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -23,11 +24,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Aucun nom d'application spécifié" #: app.php:361 msgid "Help" @@ -52,7 +53,7 @@ msgstr "Administration" #: app.php:837 #, php-format msgid "Failed to upgrade \"%s\"." -msgstr "" +msgstr "Echec de la mise à niveau \"%s\"." #: defaults.php:35 msgid "web services under your control" @@ -61,7 +62,7 @@ msgstr "services web sous votre contrôle" #: files.php:66 files.php:98 #, php-format msgid "cannot open \"%s\"" -msgstr "" +msgstr "impossible d'ouvrir \"%s\"" #: files.php:226 msgid "ZIP download is turned off." @@ -83,63 +84,63 @@ msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés. msgid "" "Download the files in smaller chunks, seperately or kindly ask your " "administrator." -msgstr "" +msgstr "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur." #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Aucune source spécifiée pour installer l'application" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Aucun href spécifié pour installer l'application par http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Les archives de type %s ne sont pas supportées" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "L'application ne fournit pas de fichier info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "L'application ne peut être installée car elle contient du code non-autorisé" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "L'application ne peut être installée car elle contient la balise true qui n'est pas autorisée pour les applications non-diffusées" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Le dossier de l'application existe déjà" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s" #: json.php:28 msgid "Application is not enabled" @@ -315,7 +316,7 @@ msgstr "il y a plusieurs années" #: template.php:297 msgid "Caused by:" -msgstr "" +msgstr "Causé par :" #: vcategories.php:188 vcategories.php:249 #, php-format diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 9729b2532b7..4da048e30f4 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 # plachance , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:40+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -91,7 +92,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Avertissement : Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles." #: templates/settings.php:12 msgid "" @@ -156,7 +157,7 @@ msgstr "Modèle d'authentification utilisateurs" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -166,7 +167,7 @@ msgstr "Filtre d'utilisateurs" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -176,7 +177,7 @@ msgstr "Filtre de groupes" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -214,7 +215,7 @@ msgstr "Désactiver le serveur principal" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Se connecter uniquement au serveur de replica." #: templates/settings.php:73 msgid "Use TLS" @@ -237,7 +238,7 @@ msgstr "Désactiver la validation du certificat SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -257,7 +258,7 @@ msgstr "Champ \"nom d'affichage\" de l'utilisateur" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché." #: templates/settings.php:81 msgid "Base User Tree" @@ -281,7 +282,7 @@ msgstr "Champ \"nom d'affichage\" du groupe" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "L'attribut LDAP utilisé pour générer le nom de groupe affiché." #: templates/settings.php:84 msgid "Base Group Tree" @@ -347,7 +348,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP." #: templates/settings.php:100 msgid "Internal Username Attribute:" @@ -366,7 +367,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -388,7 +389,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index d24a55c6e23..3766c1513c8 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" -"PO-Revision-Date: 2013-09-03 10:00+0000\n" -"Last-Translator: Christophe Lherieau \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 11:00+0000\n" +"Last-Translator: yann_hellier \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" @@ -25,7 +25,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "Authentification WebDAV" +msgstr "" #: templates/settings.php:4 msgid "Address: " diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 6de09cdb0f7..3a9323639d0 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:20+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,7 +170,7 @@ msgstr[1] "%n ficheiros" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 6680a8ba6b3..3aeb046dccc 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:00+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,28 +30,28 @@ msgstr "grupa" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Włączony tryb konserwacji" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Wyłączony tryb konserwacji" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Zaktualizuj bazę" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualizowanie filecache, to może potrwać bardzo długo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Zaktualizuj filecache" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% udane ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,59 +172,59 @@ msgstr "Grudzień" msgid "Settings" msgstr "Ustawienia" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n minute temu" +msgstr[1] "%n minut temu" +msgstr[2] "%n minut temu" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n godzine temu" +msgstr[1] "%n godzin temu" +msgstr[2] "%n godzin temu" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "dziś" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n dzień temu" +msgstr[1] "%n dni temu" +msgstr[2] "%n dni temu" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "w zeszłym miesiącu" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n miesiąc temu" +msgstr[1] "%n miesięcy temu" +msgstr[2] "%n miesięcy temu" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "miesięcy temu" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "w zeszłym roku" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "lat temu" @@ -411,7 +411,7 @@ msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud." #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s reset hasła" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 8bab0cf5908..df1d1d20470 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -4,14 +4,15 @@ # # Translators: # Cyryl Sochacki , 2013 +# Mariusz Fik , 2013 # adbrand , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 09:20+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -160,27 +161,27 @@ msgstr "cofnij" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n katalog" +msgstr[1] "%n katalogi" +msgstr[2] "%n katalogów" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n plik" +msgstr[1] "%n pliki" +msgstr[2] "%n plików" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{katalogi} and {pliki}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Wysyłanie %n pliku" +msgstr[1] "Wysyłanie %n plików" +msgstr[2] "Wysyłanie %n plików" #: js/filelist.js:628 msgid "files uploading" @@ -212,7 +213,7 @@ msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki." #: js/files.js:245 msgid "" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index fd82c9bdd6d..d06393b1c89 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 22:20+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" @@ -28,45 +28,45 @@ msgstr "Nie można trwale usunąć %s" msgid "Couldn't restore %s" msgstr "Nie można przywrócić %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "wykonywanie operacji przywracania" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Błąd" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "trwale usuń plik" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Trwale usuń" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nazwa" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Usunięte" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n katalogów" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n plików" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "przywrócony" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index d44b5a180f1..0d7e4c48452 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:10+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Nie określono nazwy aplikacji" #: app.php:361 msgid "Help" @@ -87,59 +87,59 @@ msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administrato #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nie określono źródła podczas instalacji aplikacji" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nie określono linku skąd aplikacja ma być zainstalowana" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nie określono lokalnego pliku z którego miała być instalowana aplikacja" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Typ archiwum %s nie jest obsługiwany" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Nie udało się otworzyć archiwum podczas instalacji aplikacji" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Aplikacja nie posiada pliku info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Aplikacja nie może być zainstalowana ponieważ true tag nie jest true , co nie jest dozwolone dla aplikacji nie wysłanych" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Katalog aplikacji już isnieje" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s" #: json.php:28 msgid "Application is not enabled" @@ -265,55 +265,55 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl msgid "Please double check the installation guides." msgstr "Sprawdź ponownie przewodniki instalacji." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "sekund temu" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n minute temu" +msgstr[1] "%n minut temu" +msgstr[2] "%n minut temu" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n godzinę temu" +msgstr[1] "%n godzin temu" +msgstr[2] "%n godzin temu" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "dziś" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "wczoraj" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n dzień temu" +msgstr[1] "%n dni temu" +msgstr[2] "%n dni temu" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "w zeszłym miesiącu" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n miesiąc temu" +msgstr[1] "%n miesięcy temu" +msgstr[2] "%n miesięcy temu" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "w zeszłym roku" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "lat temu" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 13437f51c48..310e6c15fa6 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:10+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,53 +86,53 @@ msgstr "Nie można usunąć użytkownika z grupy %s" msgid "Couldn't update app." msgstr "Nie można uaktualnić aplikacji." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizacja do {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Wyłącz" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Włącz" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Proszę czekać..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Błąd podczas wyłączania aplikacji" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Błąd podczas włączania aplikacji" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aktualizacja w toku..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Błąd podczas aktualizacji aplikacji" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Błąd" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aktualizuj" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Zaktualizowano" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas." #: js/personal.js:172 msgid "Saving..." @@ -194,7 +194,7 @@ msgid "" "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 "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW." #: templates/admin.php:29 msgid "Setup Warning" @@ -231,7 +231,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -244,7 +244,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje." #: templates/admin.php:92 msgid "Cron" @@ -258,11 +258,11 @@ msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną" msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę." #: templates/admin.php:120 msgid "Sharing" @@ -291,7 +291,7 @@ msgstr "Pozwól na publiczne wczytywanie" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów" #: templates/admin.php:152 msgid "Allow resharing" @@ -327,7 +327,7 @@ msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączeni msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL." #: templates/admin.php:203 msgid "Log" @@ -473,7 +473,7 @@ msgstr "WebDAV" msgid "" "Use this address to access your Files via WebDAV" -msgstr "" +msgstr "Użyj tego adresu do dostępu do twoich plików przez WebDAV" #: templates/personal.php:117 msgid "Encryption" @@ -481,15 +481,15 @@ msgstr "Szyfrowanie" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Hasło logowania" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Odszyfruj wszystkie pliki" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 4c0e3a677c2..0405b8cabf8 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -171,55 +171,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 8e7a4df03e9..edc1434fe7c 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 b4ab99474a0..8ad9f8fe117 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 780ae791813..551a91905d7 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 e5052a67c11..fe5a83d1b43 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index c468f343d19..784a56543d3 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 170cd574cb0..b737c6b8590 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 802d246a6ac..ce7cf69cfd4 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:44-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 c5c3abed6cc..f6c3ec932b4 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:44-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 3990f5bce43..ab5d56dc2fd 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 8a84e0fe61a..7010282b015 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\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 3f86937276e..c16793359c9 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Fatih Aşıcı , 2013 # ismail yenigül , 2013 # tridinebandim, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 11:02+0000\n" +"Last-Translator: Fatih Aşıcı \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" @@ -30,28 +31,28 @@ msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Bakım kipi etkinleştirildi" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Bakım kipi kapatıldı" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Veritabanı güncellendi" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Dosya önbelleği güncellendi" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "%%%d tamamlandı ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,55 +173,55 @@ msgstr "Aralık" msgid "Settings" msgstr "Ayarlar" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "saniye önce" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "bugün" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "dün" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "geçen ay" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "ay önce" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "geçen yıl" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "yıl önce" diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 7a82f8f6a19..bd13106237a 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -24,6 +24,9 @@ $TRANSLATIONS = array( "App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación", "App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud", "App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n\ntrue\n\nque no está permitida para aplicaciones no distribuidas", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store", +"App directory already exists" => "El directorio de la aplicación ya existe", +"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error de autenticación", "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.", @@ -51,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", "seconds ago" => "hace segundos", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "año pasado", "years ago" => "hace años", "Caused by:" => "Causado por:", diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index b9ba71c402e..da3ec4ce372 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -1,15 +1,32 @@ "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.", +"No app name specified" => "Aucun nom d'application spécifié", "Help" => "Aide", "Personal" => "Personnel", "Settings" => "Paramètres", "Users" => "Utilisateurs", "Admin" => "Administration", +"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".", "web services under your control" => "services web sous votre contrôle", +"cannot open \"%s\"" => "impossible d'ouvrir \"%s\"", "ZIP download is turned off." => "Téléchargement ZIP désactivé.", "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.", "Back to Files" => "Retour aux Fichiers", "Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur.", +"No source specified when installing app" => "Aucune source spécifiée pour installer l'application", +"No href specified when installing app from http" => "Aucun href spécifié pour installer l'application par http", +"No path specified when installing app from local file" => "Aucun chemin spécifié pour installer l'application depuis un fichier local", +"Archives of type %s are not supported" => "Les archives de type %s ne sont pas supportées", +"Failed to open archive when installing app" => "Échec de l'ouverture de l'archive lors de l'installation de l'application", +"App does not provide an info.xml file" => "L'application ne fournit pas de fichier info.xml", +"App can't be installed because of not allowed code in the App" => "L'application ne peut être installée car elle contient du code non-autorisé", +"App can't be installed because it is not compatible with this version of ownCloud" => "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "L'application ne peut être installée car elle contient la balise true qui n'est pas autorisée pour les applications non-diffusées", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store", +"App directory already exists" => "Le dossier de l'application existe déjà", +"Can't create app folder. Please fix permissions. %s" => "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s", "Application is not enabled" => "L'application n'est pas activée", "Authentication error" => "Erreur d'authentification", "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.", @@ -46,6 +63,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", +"Caused by:" => "Causé par :", "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index 984043aa0be..4acd735d692 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -1,5 +1,7 @@ "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud.", +"No app name specified" => "Nie określono nazwy aplikacji", "Help" => "Pomoc", "Personal" => "Osobiste", "Settings" => "Ustawienia", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Wróć do plików", "Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.", +"No source specified when installing app" => "Nie określono źródła podczas instalacji aplikacji", +"No href specified when installing app from http" => "Nie określono linku skąd aplikacja ma być zainstalowana", +"No path specified when installing app from local file" => "Nie określono lokalnego pliku z którego miała być instalowana aplikacja", +"Archives of type %s are not supported" => "Typ archiwum %s nie jest obsługiwany", +"Failed to open archive when installing app" => "Nie udało się otworzyć archiwum podczas instalacji aplikacji", +"App does not provide an info.xml file" => "Aplikacja nie posiada pliku info.xml", +"App can't be installed because of not allowed code in the App" => "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji", +"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Aplikacja nie może być zainstalowana ponieważ true tag nie jest true , co nie jest dozwolone dla aplikacji nie wysłanych", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store", +"App directory already exists" => "Katalog aplikacji już isnieje", +"Can't create app folder. Please fix permissions. %s" => "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s", "Application is not enabled" => "Aplikacja nie jest włączona", "Authentication error" => "Błąd uwierzytelniania", "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.", @@ -40,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the installation guides." => "Sprawdź ponownie przewodniki instalacji.", "seconds ago" => "sekund temu", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"), +"_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"), "today" => "dziś", "yesterday" => "wczoraj", -"_%n day go_::_%n days ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"), "last month" => "w zeszłym miesiącu", -"_%n month ago_::_%n months ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "last year" => "w zeszłym roku", "years ago" => "lat temu", "Caused by:" => "Spowodowane przez:", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 4f3099b8c24..52610e1c4fe 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -2,7 +2,7 @@ $TRANSLATIONS = array( "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store", "Authentication error" => "Error de autenticación", -"Your display name has been changed." => "Su nombre fue cambiado.", +"Your display name has been changed." => "Su nombre de usuario ha sido cambiado.", "Unable to change display name" => "No se pudo cambiar el nombre de usuario", "Group already exists" => "El grupo ya existe", "Unable to add group" => "No se pudo añadir el grupo", @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Espere, por favor....", +"Error while disabling app" => "Error mientras se desactivaba la aplicación", +"Error while enabling app" => "Error mientras se activaba la aplicación", "Updating...." => "Actualizando....", "Error while updating app" => "Error mientras se actualizaba la aplicación", "Error" => "Error", "Update" => "Actualizar", "Updated" => "Actualizado", +"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.", "Saving..." => "Guardando...", "deleted" => "Eliminado", "undo" => "deshacer", @@ -38,12 +41,12 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Se debe proporcionar una contraseña valida", "__language_name__" => "Castellano", "Security Warning" => "Advertencia de seguridad", -"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.", "Setup Warning" => "Advertencia de configuración", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", -"Module 'fileinfo' missing" => "Módulo 'fileinfo' perdido", -"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type", +"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type", "Locale not working" => "La configuración regional no está funcionando", "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La configuración regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.", "Internet connection not working" => "La conexion a internet no esta funcionando", @@ -56,7 +59,7 @@ $TRANSLATIONS = array( "Enable Share API" => "Activar API de Compartición", "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición", "Allow links" => "Permitir enlaces", -"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces", +"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces", "Allow public uploads" => "Permitir subidas públicas", "Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente", "Allow resharing" => "Permitir re-compartición", @@ -76,8 +79,8 @@ $TRANSLATIONS = array( "Add your App" => "Añade tu aplicación", "More Apps" => "Más aplicaciones", "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 ", +"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com", +"-licensed by " => "-licencia otorgada por ", "User Documentation" => "Documentación de usuario", "Administrator Documentation" => "Documentación de adminstrador", "Online Documentation" => "Documentación en linea", @@ -85,7 +88,7 @@ $TRANSLATIONS = array( "Bugtracker" => "Rastreador de fallos", "Commercial Support" => "Soporte comercial", "Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos", -"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez", +"Show First Run Wizard again" => "Mostrar asistente para iniciar de nuevo", "You have used %s of the available %s" => "Ha usado %s de los %s disponibles", "Password" => "Contraseña", "Your password was changed" => "Su contraseña ha sido cambiada", @@ -98,10 +101,13 @@ $TRANSLATIONS = array( "Your email address" => "Su dirección de correo", "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña", "Language" => "Idioma", -"Help translate" => "Ayúdnos a traducir", +"Help translate" => "Ayúdanos a traducir", "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Utilice esta dirección paraacceder a sus archivos a través de WebDAV", "Encryption" => "Cifrado", +"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de cifrado no está activada, descifre sus archivos", +"Log-in password" => "Contraseña de acceso", +"Decrypt all Files" => "Descifrar archivos", "Login Name" => "Nombre de usuario", "Create" => "Crear", "Admin Recovery Password" => "Recuperación de la contraseña de administración", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index 1d8619de7e7..a8bc60ffed6 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Wyłącz", "Enable" => "Włącz", "Please wait...." => "Proszę czekać...", +"Error while disabling app" => "Błąd podczas wyłączania aplikacji", +"Error while enabling app" => "Błąd podczas włączania aplikacji", "Updating...." => "Aktualizacja w toku...", "Error while updating app" => "Błąd podczas aktualizacji aplikacji", "Error" => "Błąd", "Update" => "Aktualizuj", "Updated" => "Zaktualizowano", +"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.", "Saving..." => "Zapisywanie...", "deleted" => "usunięto", "undo" => "cofnij", @@ -38,21 +41,27 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Należy podać prawidłowe hasło", "__language_name__" => "polski", "Security Warning" => "Ostrzeżenie o zabezpieczeniach", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.", "Setup Warning" => "Ostrzeżenia konfiguracji", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the installation guides." => "Proszę sprawdź ponownie przewodnik instalacji.", "Module 'fileinfo' missing" => "Brak modułu „fileinfo”", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.", "Locale not working" => "Lokalizacja nie działa", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.", "Internet connection not working" => "Połączenie internetowe nie działa", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.", "Cron" => "Cron", "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http.", +"Use systems cron service to call the cron.php file once a minute." => "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę.", "Sharing" => "Udostępnianie", "Enable Share API" => "Włącz API udostępniania", "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania", "Allow links" => "Zezwalaj na odnośniki", "Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników", "Allow public uploads" => "Pozwól na publiczne wczytywanie", +"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów", "Allow resharing" => "Zezwalaj na ponowne udostępnianie", "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych", "Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek", @@ -60,6 +69,7 @@ $TRANSLATIONS = array( "Security" => "Bezpieczeństwo", "Enforce HTTPS" => "Wymuś HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.", "Log" => "Logi", "Log level" => "Poziom logów", "More" => "Więcej", @@ -93,7 +103,11 @@ $TRANSLATIONS = array( "Language" => "Język", "Help translate" => "Pomóż w tłumaczeniu", "WebDAV" => "WebDAV", +"Use this address to access your Files via WebDAV" => "Użyj tego adresu do dostępu do twoich plików przez WebDAV", "Encryption" => "Szyfrowanie", +"The encryption app is no longer enabled, decrypt all your file" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik", +"Log-in password" => "Hasło logowania", +"Decrypt all Files" => "Odszyfruj wszystkie pliki", "Login Name" => "Login", "Create" => "Utwórz", "Admin Recovery Password" => "Odzyskiwanie hasła administratora", -- cgit v1.2.3 From 221bbd275cf8dfaec5810745ad319f0daeacc8d6 Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 5 Sep 2013 23:26:02 +0200 Subject: Use \OC_App for checking whether encryption is enabled --- lib/avatar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/avatar.php b/lib/avatar.php index 5f73a9bf220..e58a596e13d 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -44,7 +44,7 @@ class OC_Avatar { * @return void */ public function set ($user, $data) { - if (\OC_Appconfig::getValue('files_encryption', 'enabled') === "yes") { + if (\OC_App::isEnabled('files_encryption')) { $l = \OC_L10N::get('lib'); throw new \Exception($l->t("Custom profile pictures don't work with encryption yet")); } -- cgit v1.2.3 From e9849270e3b9a15b6694f78c7bca33bbed603888 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 6 Sep 2013 00:28:13 +0200 Subject: Revert "fixes #4574" This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614. --- lib/base.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index fe160f73652..ea5adbadc9d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -826,16 +826,11 @@ class OC { ) { return false; } - // don't redo authentication if user is already logged in - // otherwise session would be invalidated in OC_User::login with - // session_regenerate_id at every page load - if (!OC_User::isLoggedIn()) { - OC_App::loadApps(array('authentication')); - if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); - OC_User::unsetMagicInCookie(); - $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); - } + OC_App::loadApps(array('authentication')); + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); } return true; } -- cgit v1.2.3 From 627b6164c43e09b1d6e0e17d1e73815fa0e9e2b4 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 5 Sep 2013 10:08:13 +0200 Subject: if the files doesn't exist yet we start with the parent to search for shares --- lib/public/share.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index fe996dbe266..06d67ab4e0a 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -134,19 +134,25 @@ class Share { * not '/admin/data/file.txt' */ public static function getUsersSharingFile($path, $user, $includeOwner = false) { - + error_log("getuser sharing files for: " . $path . " and " . $user); $shares = array(); $publicShare = false; $source = -1; $cache = false; - $view = new \OC\Files\View('/' . $user . '/files/'); - $meta = $view->getFileInfo(\OC\Files\Filesystem::normalizePath($path)); + $view = new \OC\Files\View('/' . $user . '/files'); + if ($view->file_exists($path)) { + $meta = $view->getFileInfo($path); + } else { + // if the file doesn't exists yet we start with the parent folder + $meta = $view->getFileInfo(dirname($path)); + } if($meta !== false) { + error_log("source: " . $meta['fileid']); $source = $meta['fileid']; $cache = new \OC\Files\Cache\Cache($meta['storage']); - } + } else error_log("no source"); while ($source !== -1) { @@ -165,6 +171,7 @@ class Share { \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); } else { while ($row = $result->fetchRow()) { + error_log("add user: " . $row['share_with']); $shares[] = $row['share_with']; } } @@ -184,6 +191,7 @@ class Share { \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); } else { while ($row = $result->fetchRow()) { + error_log("group found: " . $row['share_with']); $usersInGroup = \OC_Group::usersInGroup($row['share_with']); $shares = array_merge($shares, $usersInGroup); } -- cgit v1.2.3 From d33fabd02d5c58fcd226e922de1285c2f9773742 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 5 Sep 2013 11:45:36 +0200 Subject: remove error logs --- lib/public/share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 06d67ab4e0a..f8a6e0313ad 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -134,7 +134,7 @@ class Share { * not '/admin/data/file.txt' */ public static function getUsersSharingFile($path, $user, $includeOwner = false) { - error_log("getuser sharing files for: " . $path . " and " . $user); + $shares = array(); $publicShare = false; $source = -1; @@ -152,7 +152,7 @@ class Share { error_log("source: " . $meta['fileid']); $source = $meta['fileid']; $cache = new \OC\Files\Cache\Cache($meta['storage']); - } else error_log("no source"); + } while ($source !== -1) { -- cgit v1.2.3 From edb78c917ce60a30e21d3e7eaef472cd8badf955 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 5 Sep 2013 11:50:36 +0200 Subject: remove some error_logs --- lib/public/share.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index f8a6e0313ad..8e0ab3ff4b7 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -149,7 +149,6 @@ class Share { } if($meta !== false) { - error_log("source: " . $meta['fileid']); $source = $meta['fileid']; $cache = new \OC\Files\Cache\Cache($meta['storage']); } -- cgit v1.2.3 From b8241aa79d732371c7436de15114f2b52afc6866 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 6 Sep 2013 10:58:42 +0200 Subject: remove some more debug output --- lib/public/share.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 8e0ab3ff4b7..9ab956d84b9 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -170,7 +170,6 @@ class Share { \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); } else { while ($row = $result->fetchRow()) { - error_log("add user: " . $row['share_with']); $shares[] = $row['share_with']; } } @@ -190,7 +189,6 @@ class Share { \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); } else { while ($row = $result->fetchRow()) { - error_log("group found: " . $row['share_with']); $usersInGroup = \OC_Group::usersInGroup($row['share_with']); $shares = array_merge($shares, $usersInGroup); } -- cgit v1.2.3 From 1cfd03771f3ba8a91b5600cf71c6f455d288bbe0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 6 Sep 2013 20:20:17 +0200 Subject: use === --- lib/files/node/node.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/node/node.php b/lib/files/node/node.php index a71f7875064..a1db042c25c 100644 --- a/lib/files/node/node.php +++ b/lib/files/node/node.php @@ -56,7 +56,7 @@ class Node { * @return bool */ protected function checkPermissions($permissions) { - return ($this->getPermissions() & $permissions) == $permissions; + return ($this->getPermissions() & $permissions) === $permissions; } /** -- cgit v1.2.3 From 0131a3202597fe2cfefbb72e1a20fd266d48451a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 6 Sep 2013 20:38:59 +0200 Subject: extract interfaces from fileapi for public namespace --- lib/files/node/file.php | 2 +- lib/files/node/folder.php | 2 +- lib/files/node/node.php | 2 +- lib/public/files/node/file.php | 44 ++++++++++++++++ lib/public/files/node/folder.php | 104 +++++++++++++++++++++++++++++++++++++ lib/public/files/node/node.php | 108 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 lib/public/files/node/file.php create mode 100644 lib/public/files/node/folder.php create mode 100644 lib/public/files/node/node.php (limited to 'lib') diff --git a/lib/files/node/file.php b/lib/files/node/file.php index 0ad5d68ec66..f13b474aa6c 100644 --- a/lib/files/node/file.php +++ b/lib/files/node/file.php @@ -10,7 +10,7 @@ namespace OC\Files\Node; use OC\Files\NotPermittedException; -class File extends Node { +class File extends Node implements \OCP\Files\Node\File { /** * @return string * @throws \OC\Files\NotPermittedException diff --git a/lib/files/node/folder.php b/lib/files/node/folder.php index f710ae5ae9a..daf75d7c23e 100644 --- a/lib/files/node/folder.php +++ b/lib/files/node/folder.php @@ -13,7 +13,7 @@ use OC\Files\Cache\Scanner; use OC\Files\NotFoundException; use OC\Files\NotPermittedException; -class Folder extends Node { +class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $path path relative to the folder * @return string diff --git a/lib/files/node/node.php b/lib/files/node/node.php index a1db042c25c..5ee9f23161f 100644 --- a/lib/files/node/node.php +++ b/lib/files/node/node.php @@ -15,7 +15,7 @@ use OC\Files\NotPermittedException; require_once 'files/exceptions.php'; -class Node { +class Node implements \OCP\Files\Node\Node { /** * @var \OC\Files\View $view */ diff --git a/lib/public/files/node/file.php b/lib/public/files/node/file.php new file mode 100644 index 00000000000..193663f60b8 --- /dev/null +++ b/lib/public/files/node/file.php @@ -0,0 +1,44 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files\Node; + +use OC\Files\NotPermittedException; + +interface File extends Node { + /** + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getContent(); + + /** + * @param string $data + * @throws \OC\Files\NotPermittedException + */ + public function putContent($data); + + /** + * @return string + */ + public function getMimeType(); + + /** + * @param string $mode + * @return resource + * @throws \OC\Files\NotPermittedException + */ + public function fopen($mode); + + /** + * @param string $type + * @param bool $raw + * @return string + */ + public function hash($type, $raw = false); +} diff --git a/lib/public/files/node/folder.php b/lib/public/files/node/folder.php new file mode 100644 index 00000000000..7b3ae80f0d7 --- /dev/null +++ b/lib/public/files/node/folder.php @@ -0,0 +1,104 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files\Node; + +use OC\Files\Cache\Cache; +use OC\Files\Cache\Scanner; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; + +interface Folder extends Node { + /** + * @param string $path path relative to the folder + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getFullPath($path); + + /** + * @param string $path + * @throws \OC\Files\NotFoundException + * @return string + */ + public function getRelativePath($path); + + /** + * check if a node is a (grand-)child of the folder + * + * @param \OC\Files\Node\Node $node + * @return bool + */ + public function isSubNode($node); + + /** + * get the content of this directory + * + * @throws \OC\Files\NotFoundException + * @return Node[] + */ + public function getDirectoryListing(); + + /** + * Get the node at $path + * + * @param string $path + * @return \OC\Files\Node\Node + * @throws \OC\Files\NotFoundException + */ + public function get($path); + + /** + * @param string $path + * @return bool + */ + public function nodeExists($path); + + /** + * @param string $path + * @return Folder + * @throws NotPermittedException + */ + public function newFolder($path); + + /** + * @param string $path + * @return File + * @throws NotPermittedException + */ + public function newFile($path); + + /** + * search for files with the name matching $query + * + * @param string $query + * @return Node[] + */ + public function search($query); + + /** + * search for files by mimetype + * + * @param string $mimetype + * @return Node[] + */ + public function searchByMime($mimetype); + + /** + * @param $id + * @return Node[] + */ + public function getById($id); + + public function getFreeSpace(); + + /** + * @return bool + */ + public function isCreatable(); +} diff --git a/lib/public/files/node/node.php b/lib/public/files/node/node.php new file mode 100644 index 00000000000..085e880e375 --- /dev/null +++ b/lib/public/files/node/node.php @@ -0,0 +1,108 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files\Node; + +interface Node { + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OC\Files\Node\Node + */ + public function move($targetPath); + + public function delete(); + + /** + * @param string $targetPath + * @return \OC\Files\Node\Node + */ + public function copy($targetPath); + + /** + * @param int $mtime + * @throws \OC\Files\NotPermittedException + */ + public function touch($mtime = null); + + /** + * @return \OC\Files\Storage\Storage + * @throws \OC\Files\NotFoundException + */ + public function getStorage(); + + /** + * @return string + */ + public function getPath(); + + /** + * @return string + */ + public function getInternalPath(); + + /** + * @return int + */ + public function getId(); + + /** + * @return array + */ + public function stat(); + + /** + * @return int + */ + public function getMTime(); + + /** + * @return int + */ + public function getSize(); + + /** + * @return string + */ + public function getEtag(); + + /** + * @return int + */ + public function getPermissions(); + + /** + * @return bool + */ + public function isReadable(); + + /** + * @return bool + */ + public function isUpdateable(); + + /** + * @return bool + */ + public function isDeletable(); + + /** + * @return bool + */ + public function isShareable(); + + /** + * @return Node + */ + public function getParent(); + + /** + * @return string + */ + public function getName(); +} -- cgit v1.2.3 From 2e1b534957460ac39bfe1f5f14148164df148e5a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 6 Sep 2013 20:55:47 +0200 Subject: update phpdoc for public fileapi --- lib/public/files/node/folder.php | 16 ++++++++-------- lib/public/files/node/node.php | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/public/files/node/folder.php b/lib/public/files/node/folder.php index 7b3ae80f0d7..af53bc9e584 100644 --- a/lib/public/files/node/folder.php +++ b/lib/public/files/node/folder.php @@ -31,7 +31,7 @@ interface Folder extends Node { /** * check if a node is a (grand-)child of the folder * - * @param \OC\Files\Node\Node $node + * @param \OCP\Files\Node\Node $node * @return bool */ public function isSubNode($node); @@ -40,7 +40,7 @@ interface Folder extends Node { * get the content of this directory * * @throws \OC\Files\NotFoundException - * @return Node[] + * @return \OCP\Files\Node\Node[] */ public function getDirectoryListing(); @@ -48,7 +48,7 @@ interface Folder extends Node { * Get the node at $path * * @param string $path - * @return \OC\Files\Node\Node + * @return \OCP\Files\Node\Node * @throws \OC\Files\NotFoundException */ public function get($path); @@ -61,14 +61,14 @@ interface Folder extends Node { /** * @param string $path - * @return Folder + * @return \OCP\Files\Node\Folder * @throws NotPermittedException */ public function newFolder($path); /** * @param string $path - * @return File + * @return \OCP\Files\Node\File * @throws NotPermittedException */ public function newFile($path); @@ -77,7 +77,7 @@ interface Folder extends Node { * search for files with the name matching $query * * @param string $query - * @return Node[] + * @return \OCP\Files\Node\Node[] */ public function search($query); @@ -85,13 +85,13 @@ interface Folder extends Node { * search for files by mimetype * * @param string $mimetype - * @return Node[] + * @return \OCP\Files\Node\Node[] */ public function searchByMime($mimetype); /** * @param $id - * @return Node[] + * @return \OCP\Files\Node\Node[] */ public function getById($id); diff --git a/lib/public/files/node/node.php b/lib/public/files/node/node.php index 085e880e375..b85f37e69a7 100644 --- a/lib/public/files/node/node.php +++ b/lib/public/files/node/node.php @@ -12,7 +12,7 @@ interface Node { /** * @param string $targetPath * @throws \OC\Files\NotPermittedException - * @return \OC\Files\Node\Node + * @return \OCP\Files\Node\Node */ public function move($targetPath); @@ -20,7 +20,7 @@ interface Node { /** * @param string $targetPath - * @return \OC\Files\Node\Node + * @return \OCP\Files\Node\Node */ public function copy($targetPath); -- cgit v1.2.3 From e895cf9188954645bc45f3e402d8dc2f0b3d43bc Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 7 Sep 2013 04:46:57 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/fr.php | 4 +- apps/files/l10n/nl.php | 1 + apps/files/l10n/nn_NO.php | 11 +- apps/files_encryption/l10n/es_AR.php | 2 + apps/files_trashbin/l10n/nn_NO.php | 4 +- apps/files_versions/l10n/es_AR.php | 3 + apps/user_webdavauth/l10n/es_AR.php | 4 +- apps/user_webdavauth/l10n/fr.php | 1 + core/l10n/ach.php | 8 + core/l10n/es_MX.php | 8 + core/l10n/nqo.php | 8 + l10n/ach/core.po | 647 +++++++++++++++++++++++++++++++++++ l10n/ach/files.po | 335 ++++++++++++++++++ l10n/ach/files_encryption.po | 176 ++++++++++ l10n/ach/files_external.po | 123 +++++++ l10n/ach/files_sharing.po | 80 +++++ l10n/ach/files_trashbin.po | 84 +++++ l10n/ach/files_versions.po | 43 +++ l10n/ach/lib.po | 322 +++++++++++++++++ l10n/ach/settings.po | 540 +++++++++++++++++++++++++++++ l10n/ach/user_ldap.po | 406 ++++++++++++++++++++++ l10n/ach/user_webdavauth.po | 33 ++ l10n/af_ZA/core.po | 28 +- l10n/af_ZA/files_sharing.po | 8 +- l10n/af_ZA/settings.po | 26 +- l10n/af_ZA/user_ldap.po | 4 +- l10n/ar/core.po | 28 +- l10n/ar/files_sharing.po | 8 +- l10n/ar/settings.po | 26 +- l10n/ar/user_ldap.po | 4 +- l10n/bg_BG/core.po | 28 +- l10n/bg_BG/files_sharing.po | 8 +- l10n/bg_BG/settings.po | 26 +- l10n/bg_BG/user_ldap.po | 4 +- l10n/bn_BD/core.po | 28 +- l10n/bn_BD/files_sharing.po | 8 +- l10n/bn_BD/settings.po | 26 +- l10n/bn_BD/user_ldap.po | 4 +- l10n/ca/core.po | 6 +- l10n/ca/files_sharing.po | 8 +- l10n/ca/settings.po | 26 +- l10n/ca/user_ldap.po | 4 +- l10n/cs_CZ/core.po | 28 +- l10n/cs_CZ/files_sharing.po | 8 +- l10n/cs_CZ/settings.po | 4 +- l10n/cs_CZ/user_ldap.po | 4 +- l10n/cy_GB/core.po | 28 +- l10n/cy_GB/files_sharing.po | 8 +- l10n/cy_GB/settings.po | 26 +- l10n/cy_GB/user_ldap.po | 4 +- l10n/da/core.po | 28 +- l10n/da/files_sharing.po | 8 +- l10n/da/settings.po | 26 +- l10n/da/user_ldap.po | 4 +- l10n/de/core.po | 28 +- l10n/de/files_sharing.po | 8 +- l10n/de/settings.po | 4 +- l10n/de/user_ldap.po | 4 +- l10n/de_CH/core.po | 28 +- l10n/de_CH/files_sharing.po | 8 +- l10n/de_CH/settings.po | 26 +- l10n/de_CH/user_ldap.po | 4 +- l10n/de_DE/core.po | 28 +- l10n/de_DE/files_sharing.po | 8 +- l10n/de_DE/settings.po | 4 +- l10n/de_DE/user_ldap.po | 4 +- l10n/el/core.po | 28 +- l10n/el/files_sharing.po | 8 +- l10n/el/settings.po | 26 +- l10n/el/user_ldap.po | 4 +- l10n/en@pirate/core.po | 28 +- l10n/en@pirate/files_sharing.po | 8 +- l10n/en@pirate/settings.po | 26 +- l10n/en@pirate/user_ldap.po | 4 +- l10n/en_GB/core.po | 28 +- l10n/en_GB/files_sharing.po | 8 +- l10n/en_GB/settings.po | 4 +- l10n/en_GB/user_ldap.po | 4 +- l10n/eo/core.po | 28 +- l10n/eo/files_sharing.po | 8 +- l10n/eo/settings.po | 26 +- l10n/eo/user_ldap.po | 4 +- l10n/es/core.po | 6 +- l10n/es/files_sharing.po | 4 +- l10n/es/lib.po | 6 +- l10n/es/settings.po | 4 +- l10n/es/user_ldap.po | 4 +- l10n/es_AR/core.po | 28 +- l10n/es_AR/files_encryption.po | 17 +- l10n/es_AR/files_sharing.po | 8 +- l10n/es_AR/files_versions.po | 15 +- l10n/es_AR/settings.po | 57 +-- l10n/es_AR/user_ldap.po | 4 +- l10n/es_AR/user_webdavauth.po | 13 +- l10n/es_MX/core.po | 647 +++++++++++++++++++++++++++++++++++ l10n/es_MX/files.po | 335 ++++++++++++++++++ l10n/es_MX/files_encryption.po | 176 ++++++++++ l10n/es_MX/files_external.po | 123 +++++++ l10n/es_MX/files_sharing.po | 80 +++++ l10n/es_MX/files_trashbin.po | 84 +++++ l10n/es_MX/files_versions.po | 43 +++ l10n/es_MX/lib.po | 322 +++++++++++++++++ l10n/es_MX/settings.po | 540 +++++++++++++++++++++++++++++ l10n/es_MX/user_ldap.po | 406 ++++++++++++++++++++++ l10n/es_MX/user_webdavauth.po | 33 ++ l10n/et_EE/core.po | 28 +- l10n/et_EE/files_sharing.po | 8 +- l10n/et_EE/settings.po | 26 +- l10n/et_EE/user_ldap.po | 4 +- l10n/eu/core.po | 28 +- l10n/eu/files_sharing.po | 8 +- l10n/eu/settings.po | 26 +- l10n/eu/user_ldap.po | 4 +- l10n/fa/core.po | 28 +- l10n/fa/files_sharing.po | 8 +- l10n/fa/settings.po | 26 +- l10n/fa/user_ldap.po | 4 +- l10n/fi_FI/core.po | 28 +- l10n/fi_FI/files_sharing.po | 8 +- l10n/fi_FI/settings.po | 26 +- l10n/fi_FI/user_ldap.po | 4 +- l10n/fr/core.po | 28 +- l10n/fr/files.po | 11 +- l10n/fr/files_sharing.po | 4 +- l10n/fr/settings.po | 4 +- l10n/fr/user_ldap.po | 4 +- l10n/fr/user_webdavauth.po | 9 +- l10n/gl/core.po | 28 +- l10n/gl/files_sharing.po | 8 +- l10n/gl/settings.po | 4 +- l10n/gl/user_ldap.po | 4 +- l10n/he/core.po | 28 +- l10n/he/files_sharing.po | 8 +- l10n/he/settings.po | 26 +- l10n/he/user_ldap.po | 4 +- l10n/hi/core.po | 28 +- l10n/hi/files_sharing.po | 8 +- l10n/hi/settings.po | 26 +- l10n/hi/user_ldap.po | 4 +- l10n/hr/core.po | 28 +- l10n/hr/files_sharing.po | 8 +- l10n/hr/settings.po | 26 +- l10n/hr/user_ldap.po | 4 +- l10n/hu_HU/core.po | 28 +- l10n/hu_HU/files_sharing.po | 8 +- l10n/hu_HU/settings.po | 26 +- l10n/hu_HU/user_ldap.po | 4 +- l10n/ia/core.po | 28 +- l10n/ia/files_sharing.po | 8 +- l10n/ia/settings.po | 26 +- l10n/ia/user_ldap.po | 4 +- l10n/id/core.po | 28 +- l10n/id/files_sharing.po | 8 +- l10n/id/settings.po | 26 +- l10n/id/user_ldap.po | 4 +- l10n/is/core.po | 28 +- l10n/is/files_sharing.po | 8 +- l10n/is/settings.po | 26 +- l10n/is/user_ldap.po | 4 +- l10n/it/core.po | 30 +- l10n/it/files_sharing.po | 8 +- l10n/it/settings.po | 4 +- l10n/it/user_ldap.po | 4 +- l10n/ja_JP/core.po | 28 +- l10n/ja_JP/files_sharing.po | 8 +- l10n/ja_JP/lib.po | 9 +- l10n/ja_JP/settings.po | 4 +- l10n/ja_JP/user_ldap.po | 4 +- l10n/ka/core.po | 28 +- l10n/ka/files_sharing.po | 8 +- l10n/ka/settings.po | 26 +- l10n/ka/user_ldap.po | 4 +- l10n/ka_GE/core.po | 28 +- l10n/ka_GE/files_sharing.po | 8 +- l10n/ka_GE/settings.po | 26 +- l10n/ka_GE/user_ldap.po | 4 +- l10n/ko/core.po | 28 +- l10n/ko/files_sharing.po | 8 +- l10n/ko/settings.po | 26 +- l10n/ko/user_ldap.po | 4 +- l10n/ku_IQ/core.po | 28 +- l10n/ku_IQ/files_sharing.po | 8 +- l10n/ku_IQ/settings.po | 26 +- l10n/ku_IQ/user_ldap.po | 4 +- l10n/lb/core.po | 28 +- l10n/lb/files_sharing.po | 8 +- l10n/lb/settings.po | 26 +- l10n/lb/user_ldap.po | 4 +- l10n/lt_LT/core.po | 28 +- l10n/lt_LT/files_sharing.po | 8 +- l10n/lt_LT/settings.po | 26 +- l10n/lt_LT/user_ldap.po | 4 +- l10n/lv/core.po | 28 +- l10n/lv/files_sharing.po | 8 +- l10n/lv/settings.po | 26 +- l10n/lv/user_ldap.po | 4 +- l10n/mk/core.po | 28 +- l10n/mk/files_sharing.po | 8 +- l10n/mk/settings.po | 26 +- l10n/mk/user_ldap.po | 4 +- l10n/ms_MY/core.po | 28 +- l10n/ms_MY/files_sharing.po | 8 +- l10n/ms_MY/settings.po | 26 +- l10n/ms_MY/user_ldap.po | 4 +- l10n/my_MM/core.po | 28 +- l10n/my_MM/files_sharing.po | 8 +- l10n/my_MM/settings.po | 26 +- l10n/my_MM/user_ldap.po | 4 +- l10n/nb_NO/core.po | 28 +- l10n/nb_NO/files_sharing.po | 8 +- l10n/nb_NO/settings.po | 26 +- l10n/nb_NO/user_ldap.po | 4 +- l10n/nl/core.po | 28 +- l10n/nl/files.po | 8 +- l10n/nl/files_sharing.po | 8 +- l10n/nl/settings.po | 26 +- l10n/nl/user_ldap.po | 4 +- l10n/nn_NO/core.po | 28 +- l10n/nn_NO/files.po | 28 +- l10n/nn_NO/files_sharing.po | 8 +- l10n/nn_NO/files_trashbin.po | 26 +- l10n/nn_NO/settings.po | 26 +- l10n/nn_NO/user_ldap.po | 4 +- l10n/nqo/core.po | 643 ++++++++++++++++++++++++++++++++++ l10n/nqo/files.po | 332 ++++++++++++++++++ l10n/nqo/files_encryption.po | 176 ++++++++++ l10n/nqo/files_external.po | 123 +++++++ l10n/nqo/files_sharing.po | 80 +++++ l10n/nqo/files_trashbin.po | 82 +++++ l10n/nqo/files_versions.po | 43 +++ l10n/nqo/lib.po | 318 +++++++++++++++++ l10n/nqo/settings.po | 540 +++++++++++++++++++++++++++++ l10n/nqo/user_ldap.po | 406 ++++++++++++++++++++++ l10n/nqo/user_webdavauth.po | 33 ++ l10n/oc/core.po | 28 +- l10n/oc/files_sharing.po | 8 +- l10n/oc/settings.po | 26 +- l10n/oc/user_ldap.po | 4 +- l10n/pl/core.po | 6 +- l10n/pl/files_sharing.po | 8 +- l10n/pl/settings.po | 4 +- l10n/pl/user_ldap.po | 4 +- l10n/pt_BR/core.po | 28 +- l10n/pt_BR/files_sharing.po | 8 +- l10n/pt_BR/settings.po | 26 +- l10n/pt_BR/user_ldap.po | 4 +- l10n/pt_PT/core.po | 28 +- l10n/pt_PT/files_sharing.po | 8 +- l10n/pt_PT/settings.po | 4 +- l10n/pt_PT/user_ldap.po | 4 +- l10n/ro/core.po | 28 +- l10n/ro/files_sharing.po | 8 +- l10n/ro/settings.po | 26 +- l10n/ro/user_ldap.po | 4 +- l10n/ru/core.po | 28 +- l10n/ru/files_sharing.po | 8 +- l10n/ru/settings.po | 26 +- l10n/ru/user_ldap.po | 4 +- l10n/si_LK/core.po | 28 +- l10n/si_LK/files_sharing.po | 8 +- l10n/si_LK/settings.po | 26 +- l10n/si_LK/user_ldap.po | 4 +- l10n/sk_SK/core.po | 28 +- l10n/sk_SK/files_sharing.po | 8 +- l10n/sk_SK/settings.po | 4 +- l10n/sk_SK/user_ldap.po | 4 +- l10n/sl/core.po | 28 +- l10n/sl/files_sharing.po | 8 +- l10n/sl/settings.po | 26 +- l10n/sl/user_ldap.po | 4 +- l10n/sq/core.po | 28 +- l10n/sq/files_sharing.po | 8 +- l10n/sq/settings.po | 26 +- l10n/sq/user_ldap.po | 4 +- l10n/sr/core.po | 28 +- l10n/sr/files_sharing.po | 8 +- l10n/sr/settings.po | 26 +- l10n/sr/user_ldap.po | 4 +- l10n/sr@latin/core.po | 28 +- l10n/sr@latin/files_sharing.po | 8 +- l10n/sr@latin/settings.po | 26 +- l10n/sr@latin/user_ldap.po | 4 +- l10n/sv/core.po | 28 +- l10n/sv/files_sharing.po | 8 +- l10n/sv/settings.po | 26 +- l10n/sv/user_ldap.po | 4 +- l10n/ta_LK/core.po | 28 +- l10n/ta_LK/files_sharing.po | 8 +- l10n/ta_LK/settings.po | 26 +- l10n/ta_LK/user_ldap.po | 4 +- l10n/te/core.po | 28 +- l10n/te/files_sharing.po | 8 +- l10n/te/settings.po | 26 +- l10n/te/user_ldap.po | 4 +- l10n/templates/core.pot | 4 +- 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_trashbin.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/th_TH/core.po | 28 +- l10n/th_TH/files_sharing.po | 8 +- l10n/th_TH/settings.po | 26 +- l10n/th_TH/user_ldap.po | 4 +- l10n/tr/core.po | 6 +- l10n/tr/files_sharing.po | 8 +- l10n/tr/settings.po | 26 +- l10n/tr/user_ldap.po | 4 +- l10n/ug/core.po | 28 +- l10n/ug/files_sharing.po | 8 +- l10n/ug/settings.po | 26 +- l10n/ug/user_ldap.po | 4 +- l10n/uk/core.po | 28 +- l10n/uk/files_sharing.po | 8 +- l10n/uk/settings.po | 26 +- l10n/uk/user_ldap.po | 4 +- l10n/ur_PK/core.po | 28 +- l10n/ur_PK/files_sharing.po | 8 +- l10n/ur_PK/settings.po | 26 +- l10n/ur_PK/user_ldap.po | 4 +- l10n/vi/core.po | 28 +- l10n/vi/files_sharing.po | 8 +- l10n/vi/settings.po | 26 +- l10n/vi/user_ldap.po | 4 +- l10n/zh_CN/core.po | 28 +- l10n/zh_CN/files_sharing.po | 8 +- l10n/zh_CN/settings.po | 26 +- l10n/zh_CN/user_ldap.po | 4 +- l10n/zh_HK/core.po | 28 +- l10n/zh_HK/files_sharing.po | 8 +- l10n/zh_HK/settings.po | 26 +- l10n/zh_HK/user_ldap.po | 4 +- l10n/zh_TW/core.po | 28 +- l10n/zh_TW/files_sharing.po | 4 +- l10n/zh_TW/settings.po | 4 +- l10n/zh_TW/user_ldap.po | 4 +- lib/l10n/ach.php | 8 + lib/l10n/es.php | 2 +- lib/l10n/es_MX.php | 8 + lib/l10n/ja_JP.php | 1 + lib/l10n/nqo.php | 8 + settings/l10n/es_AR.php | 14 + 347 files changed, 10627 insertions(+), 2189 deletions(-) create mode 100644 core/l10n/ach.php create mode 100644 core/l10n/es_MX.php create mode 100644 core/l10n/nqo.php create mode 100644 l10n/ach/core.po create mode 100644 l10n/ach/files.po create mode 100644 l10n/ach/files_encryption.po create mode 100644 l10n/ach/files_external.po create mode 100644 l10n/ach/files_sharing.po create mode 100644 l10n/ach/files_trashbin.po create mode 100644 l10n/ach/files_versions.po create mode 100644 l10n/ach/lib.po create mode 100644 l10n/ach/settings.po create mode 100644 l10n/ach/user_ldap.po create mode 100644 l10n/ach/user_webdavauth.po create mode 100644 l10n/es_MX/core.po create mode 100644 l10n/es_MX/files.po create mode 100644 l10n/es_MX/files_encryption.po create mode 100644 l10n/es_MX/files_external.po create mode 100644 l10n/es_MX/files_sharing.po create mode 100644 l10n/es_MX/files_trashbin.po create mode 100644 l10n/es_MX/files_versions.po create mode 100644 l10n/es_MX/lib.po create mode 100644 l10n/es_MX/settings.po create mode 100644 l10n/es_MX/user_ldap.po create mode 100644 l10n/es_MX/user_webdavauth.po create mode 100644 l10n/nqo/core.po create mode 100644 l10n/nqo/files.po create mode 100644 l10n/nqo/files_encryption.po create mode 100644 l10n/nqo/files_external.po create mode 100644 l10n/nqo/files_sharing.po create mode 100644 l10n/nqo/files_trashbin.po create mode 100644 l10n/nqo/files_versions.po create mode 100644 l10n/nqo/lib.po create mode 100644 l10n/nqo/settings.po create mode 100644 l10n/nqo/user_ldap.po create mode 100644 l10n/nqo/user_webdavauth.po create mode 100644 lib/l10n/ach.php create mode 100644 lib/l10n/es_MX.php create mode 100644 lib/l10n/nqo.php (limited to 'lib') diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index ce19bb60eb7..2d538262a0a 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -6,8 +6,8 @@ $TRANSLATIONS = array( "Invalid Token" => "Jeton non valide", "No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue", "There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.", "The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.", "No file was uploaded" => "Pas de fichier envoyé.", "Missing a temporary folder" => "Absence de dossier temporaire.", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 9fb13517369..8e9454e7945 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "ongedaan maken", "_%n folder_::_%n folders_" => array("","%n mappen"), "_%n file_::_%n files_" => array("","%n bestanden"), +"{dirs} and {files}" => "{dirs} en {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"), "files uploading" => "bestanden aan het uploaden", "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index b1f38057a88..58aafac27c4 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet", "Could not move %s" => "Klarte ikkje flytta %s", +"Unable to set upload directory." => "Klarte ikkje å endra opplastingsmappa.", +"Invalid Token" => "Ugyldig token", "No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil", "There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ", @@ -31,19 +33,22 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}", "undo" => "angre", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), +"{dirs} and {files}" => "{dirs} og {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"), "files uploading" => "filer lastar opp", "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.", "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.", "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!", "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.", "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.", "Name" => "Namn", "Size" => "Storleik", "Modified" => "Endra", +"%s could not be renamed" => "Klarte ikkje å omdøypa på %s", "Upload" => "Last opp", "File handling" => "Filhandtering", "Maximum upload size" => "Maksimal opplastingsstorleik", diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php index cac8c465362..666ea59687c 100644 --- a/apps/files_encryption/l10n/es_AR.php +++ b/apps/files_encryption/l10n/es_AR.php @@ -10,6 +10,8 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos.", "Missing requirements." => "Requisitos incompletos.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.", +"Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:", "Saving..." => "Guardando...", "Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.", "You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu", diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php index 9e351668e33..078adbc0e26 100644 --- a/apps/files_trashbin/l10n/nn_NO.php +++ b/apps/files_trashbin/l10n/nn_NO.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Slett for godt", "Name" => "Namn", "Deleted" => "Sletta", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n mapper"), +"_%n file_::_%n files_" => array("","%n filer"), "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!", "Restore" => "Gjenopprett", "Delete" => "Slett", diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php index 068f835d0af..3008220122f 100644 --- a/apps/files_versions/l10n/es_AR.php +++ b/apps/files_versions/l10n/es_AR.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "No se pudo revertir: %s ", "Versions" => "Versiones", +"Failed to revert {file} to revision {timestamp}." => "Falló al revertir {file} a la revisión {timestamp}.", +"More versions..." => "Más versiones...", +"No other versions available" => "No hay más versiones disponibles", "Restore" => "Recuperar" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php index 608b0ad8179..4ec0bf5a626 100644 --- a/apps/user_webdavauth/l10n/es_AR.php +++ b/apps/user_webdavauth/l10n/es_AR.php @@ -1,5 +1,7 @@ "Autenticación de WevDAV" +"WebDAV Authentication" => "Autenticación de WebDAV", +"Address: " => "Dirección:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php index b11e3d5a026..709fa53dac5 100644 --- a/apps/user_webdavauth/l10n/fr.php +++ b/apps/user_webdavauth/l10n/fr.php @@ -1,5 +1,6 @@ "Authentification WebDAV", "Address: " => "Adresse :", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." ); diff --git a/core/l10n/ach.php b/core/l10n/ach.php new file mode 100644 index 00000000000..25f1137e8cd --- /dev/null +++ b/core/l10n/ach.php @@ -0,0 +1,8 @@ + array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php new file mode 100644 index 00000000000..93c8e33f3e2 --- /dev/null +++ b/core/l10n/es_MX.php @@ -0,0 +1,8 @@ + array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php new file mode 100644 index 00000000000..556cca20dac --- /dev/null +++ b/core/l10n/nqo.php @@ -0,0 +1,8 @@ + array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day ago_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/l10n/ach/core.po b/l10n/ach/core.po new file mode 100644 index 00000000000..b6ac1f4c9ac --- /dev/null +++ b/l10n/ach/core.po @@ -0,0 +1,647 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: ajax/share.php:227 +msgid "group" +msgstr "" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "" + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:33 +msgid "Monday" +msgstr "" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "" + +#: js/config.php:36 +msgid "Thursday" +msgstr "" + +#: js/config.php:37 +msgid "Friday" +msgstr "" + +#: js/config.php:38 +msgid "Saturday" +msgstr "" + +#: js/config.php:43 +msgid "January" +msgstr "" + +#: js/config.php:44 +msgid "February" +msgstr "" + +#: js/config.php:45 +msgid "March" +msgstr "" + +#: js/config.php:46 +msgid "April" +msgstr "" + +#: js/config.php:47 +msgid "May" +msgstr "" + +#: js/config.php:48 +msgid "June" +msgstr "" + +#: js/config.php:49 +msgid "July" +msgstr "" + +#: js/config.php:50 +msgid "August" +msgstr "" + +#: js/config.php:51 +msgid "September" +msgstr "" + +#: js/config.php:52 +msgid "October" +msgstr "" + +#: js/config.php:53 +msgid "November" +msgstr "" + +#: js/config.php:54 +msgid "December" +msgstr "" + +#: js/js.js:355 +msgid "Settings" +msgstr "" + +#: js/js.js:821 +msgid "seconds ago" +msgstr "" + +#: js/js.js:822 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:823 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:824 +msgid "today" +msgstr "" + +#: js/js.js:825 +msgid "yesterday" +msgstr "" + +#: js/js.js:826 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:827 +msgid "last month" +msgstr "" + +#: js/js.js:828 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:829 +msgid "months ago" +msgstr "" + +#: js/js.js:830 +msgid "last year" +msgstr "" + +#: js/js.js:831 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:210 +msgid "Error loading file picker template" +msgstr "" + +#: js/oc-dialogs.js:168 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:178 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:195 +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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:643 js/share.js:655 +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:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "" + +#: js/share.js:90 +msgid "Share" +msgstr "" + +#: js/share.js:131 js/share.js:683 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:183 +msgid "Share with" +msgstr "" + +#: js/share.js:188 +msgid "Share with link" +msgstr "" + +#: js/share.js:191 +msgid "Password protect" +msgstr "" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "" + +#: js/share.js:203 +msgid "Send" +msgstr "" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Share via email:" +msgstr "" + +#: js/share.js:243 +msgid "No people found" +msgstr "" + +#: js/share.js:281 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:317 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:338 +msgid "Unshare" +msgstr "" + +#: js/share.js:350 +msgid "can edit" +msgstr "" + +#: js/share.js:352 +msgid "access control" +msgstr "" + +#: js/share.js:355 +msgid "create" +msgstr "" + +#: js/share.js:358 +msgid "update" +msgstr "" + +#: js/share.js:361 +msgid "delete" +msgstr "" + +#: js/share.js:364 +msgid "share" +msgstr "" + +#: js/share.js:398 js/share.js:630 +msgid "Password protected" +msgstr "" + +#: js/share.js:643 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:655 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:670 +msgid "Sending ..." +msgstr "" + +#: js/share.js:681 +msgid "Email sent" +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:62 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
      If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
      If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
      Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +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 templates/layout.user.php:105 +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:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:33 +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:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:66 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:37 +msgid "remember" +msgstr "" + +#: templates/login.php:39 +msgid "Log in" +msgstr "" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/ach/files.po b/l10n/ach/files.po new file mode 100644 index 00000000000..1edc94cfa5f --- /dev/null +++ b/l10n/ach/files.po @@ -0,0 +1,335 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:12 +msgid "Files" +msgstr "" + +#: js/file-upload.js:11 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:24 +msgid "Not enough space available" +msgstr "" + +#: js/file-upload.js:64 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:165 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:239 +msgid "URL cannot be empty." +msgstr "" + +#: js/file-upload.js:244 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "" + +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +msgid "Error" +msgstr "" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "" + +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +msgid "Pending" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "replace" +msgstr "" + +#: js/filelist.js:307 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "cancel" +msgstr "" + +#: js/filelist.js:354 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:354 +msgid "undo" +msgstr "" + +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:432 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:563 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:628 +msgid "files uploading" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/files.js:245 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:563 templates/index.php:69 +msgid "Name" +msgstr "" + +#: js/files.js:564 templates/index.php:81 +msgid "Size" +msgstr "" + +#: js/files.js:565 templates/index.php:83 +msgid "Modified" +msgstr "" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:41 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:52 +msgid "You don’t have write permissions here." +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:75 +msgid "Download" +msgstr "" + +#: templates/index.php:88 templates/index.php:89 +msgid "Unshare" +msgstr "" + +#: templates/index.php:94 templates/index.php:95 +msgid "Delete" +msgstr "" + +#: templates/index.php:108 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:110 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:115 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:118 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po new file mode 100644 index 00000000000..bc509f34dc4 --- /dev/null +++ b/l10n/ach/files_encryption.po @@ -0,0 +1,176 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: hooks/hooks.php:51 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:52 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "" + +#: hooks/hooks.php:250 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "" + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po new file mode 100644 index 00000000000..f3808f1199d --- /dev/null +++ b/l10n/ach/files_external.po @@ -0,0 +1,123 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:453 +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:457 +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 "" + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:12 +msgid "Options" +msgstr "" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:90 +msgid "None set" +msgstr "" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "" + +#: templates/settings.php:100 +msgid "Users" +msgstr "" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po new file mode 100644 index 00000000000..a6aa642bca6 --- /dev/null +++ b/l10n/ach/files_sharing.po @@ -0,0 +1,80 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:26 templates/public.php:92 +msgid "Download" +msgstr "" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "" + +#: templates/public.php:89 +msgid "No preview available for" +msgstr "" diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po new file mode 100644 index 00000000000..327f892ea05 --- /dev/null +++ b/l10n/ach/files_trashbin.po @@ -0,0 +1,84 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:184 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:185 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:193 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/trash.js:199 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "" diff --git a/l10n/ach/files_versions.po b/l10n/ach/files_versions.po new file mode 100644 index 00000000000..71bc81dabab --- /dev/null +++ b/l10n/ach/files_versions.po @@ -0,0 +1,43 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:7 +msgid "Versions" +msgstr "" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:79 +msgid "More versions..." +msgstr "" + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:145 +msgid "Restore" +msgstr "" diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po new file mode 100644 index 00000000000..f5999b79cfc --- /dev/null +++ b/l10n/ach/lib.po @@ -0,0 +1,322 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: app.php:250 +msgid "No app name specified" +msgstr "" + +#: app.php:361 +msgid "Help" +msgstr "" + +#: app.php:374 +msgid "Personal" +msgstr "" + +#: app.php:385 +msgid "Settings" +msgstr "" + +#: app.php:397 +msgid "Users" +msgstr "" + +#: app.php:410 +msgid "Admin" +msgstr "" + +#: app.php:837 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "" + +#: installer.php:123 +msgid "App does not provide an info.xml file" +msgstr "" + +#: installer.php:129 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: installer.php:138 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: installer.php:144 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: installer.php:150 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: installer.php:160 +msgid "App directory already exists" +msgstr "" + +#: installer.php:173 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template/functions.php:96 +msgid "seconds ago" +msgstr "" + +#: template/functions.php:97 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:98 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:99 +msgid "today" +msgstr "" + +#: template/functions.php:100 +msgid "yesterday" +msgstr "" + +#: template/functions.php:101 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:102 +msgid "last month" +msgstr "" + +#: template/functions.php:103 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:104 +msgid "last year" +msgstr "" + +#: template/functions.php:105 +msgid "years ago" +msgstr "" + +#: template.php:297 +msgid "Caused by:" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po new file mode 100644 index 00000000000..82c551ea623 --- /dev/null +++ b/l10n/ach/settings.po @@ -0,0 +1,540 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "" + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:126 +msgid "Error" +msgstr "" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "" + +#: js/apps.js:130 +msgid "Updated" +msgstr "" + +#: js/personal.js:150 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:172 +msgid "Saving..." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 +msgid "Groups" +msgstr "" + +#: js/users.js:97 templates/users.php:89 templates/users.php:124 +msgid "Group Admin" +msgstr "" + +#: js/users.js:120 templates/users.php:164 +msgid "Delete" +msgstr "" + +#: js/users.js:277 +msgid "add group" +msgstr "" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:40 personal.php:41 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "" + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:92 +msgid "Cron" +msgstr "" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "" + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "" + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:170 +msgid "Security" +msgstr "" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:203 +msgid "Log" +msgstr "" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "" + +#: templates/admin.php:235 +msgid "More" +msgstr "" + +#: templates/admin.php:236 +msgid "Less" +msgstr "" + +#: templates/admin.php:242 templates/personal.php:140 +msgid "Version" +msgstr "" + +#: templates/admin.php:246 templates/personal.php:143 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:86 +msgid "Password" +msgstr "" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:44 +msgid "New password" +msgstr "" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "" + +#: templates/personal.php:58 templates/users.php:85 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:73 +msgid "Email" +msgstr "" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:85 templates/personal.php:86 +msgid "Language" +msgstr "" + +#: templates/personal.php:98 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:104 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:106 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "" + +#: templates/personal.php:117 +msgid "Encryption" +msgstr "" + +#: templates/personal.php:119 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "" + +#: templates/personal.php:125 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:130 +msgid "Decrypt all Files" +msgstr "" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "" + +#: templates/users.php:30 +msgid "Create" +msgstr "" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:48 templates/users.php:142 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:66 templates/users.php:157 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Username" +msgstr "" + +#: templates/users.php:91 +msgid "Storage" +msgstr "" + +#: templates/users.php:102 +msgid "change display name" +msgstr "" + +#: templates/users.php:106 +msgid "set new password" +msgstr "" + +#: templates/users.php:137 +msgid "Default" +msgstr "" diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po new file mode 100644 index 00000000000..8c2514234b3 --- /dev/null +++ b/l10n/ach/user_ldap.po @@ -0,0 +1,406 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:112 +msgid "Success" +msgstr "" + +#: js/settings.js:117 +msgid "Error" +msgstr "" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:37 +msgid "Host" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "" + +#: templates/settings.php:46 +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:47 +msgid "Password" +msgstr "" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:69 +msgid "Port" +msgstr "" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "" + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "" + +#: templates/settings.php:108 +msgid "Help" +msgstr "" diff --git a/l10n/ach/user_webdavauth.po b/l10n/ach/user_webdavauth.po new file mode 100644 index 00000000000..f4fa10e1a4e --- /dev/null +++ b/l10n/ach/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ach\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "" + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index bf1d8334e31..cb6d7ff9058 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -170,55 +170,55 @@ msgstr "" msgid "Settings" msgstr "Instellings" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po index a51530f213f..1aa1c35c8b1 100644 --- a/l10n/af_ZA/files_sharing.po +++ b/l10n/af_ZA/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-04 01:55-0400\n" -"PO-Revision-Date: 2013-08-04 05:02+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index 97f1665f351..4418949ce77 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po index b4f237d6109..4c25c9eb187 100644 --- a/l10n/af_ZA/user_ldap.po +++ b/l10n/af_ZA/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 47fc1f25710..11ca9dc519d 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,11 +170,11 @@ msgstr "كانون الاول" msgid "Settings" msgstr "إعدادات" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "منذ ثواني" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -184,7 +184,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -194,15 +194,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "اليوم" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "يوم أمس" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -212,11 +212,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "الشهر الماضي" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -226,15 +226,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "شهر مضى" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "السنةالماضية" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "سنة مضت" @@ -418,7 +418,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر msgid "The update was successful. Redirecting you to ownCloud now." msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po index af3920e0949..7f7187cc9a9 100644 --- a/l10n/ar/files_sharing.po +++ b/l10n/ar/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s شارك المجلد %s معك" msgid "%s shared the file %s with you" msgstr "%s شارك الملف %s معك" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "تحميل" @@ -75,6 +75,6 @@ msgstr "رفع" msgid "Cancel upload" msgstr "إلغاء رفع الملفات" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "لا يوجد عرض مسبق لـ" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index a3d217bb4e9..8bf50316cd1 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "فشل إزالة المستخدم من المجموعة %s" msgid "Couldn't update app." msgstr "تعذر تحديث التطبيق." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "تم التحديث الى " -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "إيقاف" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "تفعيل" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "الرجاء الانتظار ..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "جاري التحديث ..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "حصل خطأ أثناء تحديث التطبيق" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "خطأ" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "حدث" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "تم التحديث بنجاح" diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index d760e3d0e43..c18c2b146fe 100644 --- a/l10n/ar/user_ldap.po +++ b/l10n/ar/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index b95f90370d7..e3aca2c2791 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "Декември" msgid "Settings" msgstr "Настройки" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "преди секунди" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "днес" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "вчера" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "последният месец" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "последната година" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "последните години" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po index ee8f206c9c2..a2c0ad5b1cf 100644 --- a/l10n/bg_BG/files_sharing.po +++ b/l10n/bg_BG/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s сподели папката %s с Вас" msgid "%s shared the file %s with you" msgstr "%s сподели файла %s с Вас" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Изтегляне" @@ -75,6 +75,6 @@ msgstr "Качване" msgid "Cancel upload" msgstr "Спри качването" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Няма наличен преглед за" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index c26480360dc..d812f5bc438 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Обновяване до {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Изключено" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Включено" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Моля почакайте...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Обновява се..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Грешка" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Обновяване" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Обновено" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index 00d80cb160e..8401703d7c0 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 9be574c0eb7..5df89ca1ab2 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -170,55 +170,55 @@ msgstr "ডিসেম্বর" msgid "Settings" msgstr "নিয়ামকসমূহ" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "সেকেন্ড পূর্বে" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "আজ" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "গতকাল" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "গত মাস" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "মাস পূর্বে" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "গত বছর" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "বছর পূর্বে" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index 13ff8fcdf45..1b5320391c2 100644 --- a/l10n/bn_BD/files_sharing.po +++ b/l10n/bn_BD/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগ msgid "%s shared the file %s with you" msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "ডাউনলোড" @@ -75,6 +75,6 @@ msgstr "আপলোড" msgid "Cancel upload" msgstr "আপলোড বাতিল কর" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index 1f3fa4e093e..7a18b1022de 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "নিষ্ক্রিয়" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "সক্রিয় " -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "সমস্যা" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "পরিবর্ধন" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index 3a816ab1ca7..8448b210a44 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index bdbf14d4d57..2820609d21b 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: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -404,7 +404,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -175,59 +175,59 @@ msgstr "Prosinec" msgid "Settings" msgstr "Nastavení" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "před %n minutou" msgstr[1] "před %n minutami" msgstr[2] "před %n minutami" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "před %n hodinou" msgstr[1] "před %n hodinami" msgstr[2] "před %n hodinami" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "dnes" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "včera" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "před %n dnem" msgstr[1] "před %n dny" msgstr[2] "před %n dny" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "minulý měsíc" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "před %n měsícem" msgstr[1] "před %n měsíci" msgstr[2] "před %n měsíci" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "před měsíci" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "minulý rok" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "před lety" @@ -411,7 +411,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s s Vámi sdílí složku %s" msgid "%s shared the file %s with you" msgstr "%s s Vámi sdílí soubor %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Stáhnout" @@ -76,6 +76,6 @@ msgstr "Odeslat" msgid "Cancel upload" msgstr "Zrušit odesílání" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Náhled není dostupný pro" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index d3f48fd240d..e8940210d9d 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-28 16:41+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 6617ad24829..69340de29b3 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-28 16:52+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index 700bfe97729..a7bf69ccd3e 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -171,11 +171,11 @@ msgstr "Rhagfyr" msgid "Settings" msgstr "Gosodiadau" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "eiliad yn ôl" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -183,7 +183,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -191,15 +191,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "heddiw" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ddoe" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -207,11 +207,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "mis diwethaf" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -219,15 +219,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "misoedd yn ôl" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "y llynedd" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "blwyddyn yn ôl" @@ -411,7 +411,7 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Rhannodd %s blygell %s â chi" msgid "%s shared the file %s with you" msgstr "Rhannodd %s ffeil %s â chi" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Llwytho i lawr" @@ -75,6 +75,6 @@ msgstr "Llwytho i fyny" msgid "Cancel upload" msgstr "Diddymu llwytho i fyny" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Does dim rhagolwg ar gael ar gyfer" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index e74e9a473f8..4b727d0b47a 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Gwall" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po index a42f865fb36..3756eac182a 100644 --- a/l10n/cy_GB/user_ldap.po +++ b/l10n/cy_GB/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/core.po b/l10n/da/core.po index adc2e0f26ca..6f779974c06 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -174,55 +174,55 @@ msgstr "December" msgid "Settings" msgstr "Indstillinger" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut siden" msgstr[1] "%n minutter siden" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time siden" msgstr[1] "%n timer siden" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "i dag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "i går" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag siden" msgstr[1] "%n dage siden" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "sidste måned" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n måned siden" msgstr[1] "%n måneder siden" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "måneder siden" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "sidste år" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "år siden" @@ -406,7 +406,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "%s adgangskode nulstillet" diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po index a6dc9237e08..5af73cd665e 100644 --- a/l10n/da/files_sharing.po +++ b/l10n/da/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med dig" msgid "%s shared the file %s with you" msgstr "%s delte filen %s med dig" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Download" @@ -76,6 +76,6 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Forhåndsvisning ikke tilgængelig for" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 5119c9950a2..806a43bd2b7 100644 --- a/l10n/da/settings.po +++ b/l10n/da/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 15:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -87,47 +87,47 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s" msgid "Couldn't update app." msgstr "Kunne ikke opdatere app'en." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Opdatér til {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktiver" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktiver" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Vent venligst..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Kunne ikke deaktivere app" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Kunne ikke aktivere app" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Opdaterer...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Der opstod en fejl under app opgraderingen" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fejl" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Opdater" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Opdateret" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index 1d75484a1d3..656890881c2 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-23 20:16-0400\n" -"PO-Revision-Date: 2013-08-22 20:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/core.po b/l10n/de/core.po index 0a572015282..6138d2307b5 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -178,55 +178,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "Heute" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "Gestern" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "Vor Jahren" @@ -410,7 +410,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Dir geteilt" msgid "%s shared the file %s with you" msgstr "%s hat die Datei %s mit Dir geteilt" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Download" @@ -77,6 +77,6 @@ msgstr "Hochladen" msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Es ist keine Vorschau verfügbar für" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 30ff6133c05..1522bb9a70f 100644 --- a/l10n/de/settings.po +++ b/l10n/de/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: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-29 11:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 36a8e317413..aa8ba6bb140 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:11-0400\n" -"PO-Revision-Date: 2013-08-20 12:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index 9469c953841..a91e8478db8 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -179,55 +179,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "Heute" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "Gestern" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "Vor Jahren" @@ -411,7 +411,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt" msgid "%s shared the file %s with you" msgstr "%s hat die Datei %s mit Ihnen geteilt" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Herunterladen" @@ -78,6 +78,6 @@ msgstr "Hochladen" msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Es ist keine Vorschau verfügbar für" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index 5e184ab89b9..f8e41f3357a 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 06:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: FlorianScholz \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -92,47 +92,47 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Update zu {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktivieren" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktivieren" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Bitte warten...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Fehler während der Deaktivierung der Anwendung" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Fehler während der Aktivierung der Anwendung" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Update..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Es ist ein Fehler während des Updates aufgetreten" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fehler" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Update durchführen" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Aktualisiert" diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po index 0267d804b6f..04763d8c636 100644 --- a/l10n/de_CH/user_ldap.po +++ b/l10n/de_CH/user_ldap.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 06:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: FlorianScholz \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index 000f19fdda5..ec4b27fe36c 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -178,55 +178,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "Heute" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "Gestern" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "Vor Jahren" @@ -410,7 +410,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt" msgid "%s shared the file %s with you" msgstr "%s hat die Datei %s mit Ihnen geteilt" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Herunterladen" @@ -77,6 +77,6 @@ msgstr "Hochladen" msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Es ist keine Vorschau verfügbar für" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index a2f41d584fa..e417ee0bd68 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-29 11:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index aa03bac5ff2..09f58790782 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:11-0400\n" -"PO-Revision-Date: 2013-08-20 07:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: noxin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" diff --git a/l10n/el/core.po b/l10n/el/core.po index ca0b80f304b..a4bcc5d67c7 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -177,55 +177,55 @@ msgstr "Δεκέμβριος" msgid "Settings" msgstr "Ρυθμίσεις" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "σήμερα" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "χτες" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "τελευταίο μήνα" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "μήνες πριν" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "τελευταίο χρόνο" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "χρόνια πριν" @@ -409,7 +409,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po index 79341a41193..4435befcebf 100644 --- a/l10n/el/files_sharing.po +++ b/l10n/el/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας" msgid "%s shared the file %s with you" msgstr "%s μοιράστηκε το αρχείο %s μαζί σας" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Λήψη" @@ -76,6 +76,6 @@ msgstr "Μεταφόρτωση" msgid "Cancel upload" msgstr "Ακύρωση αποστολής" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index c8580902be2..c02526fbe00 100644 --- a/l10n/el/settings.po +++ b/l10n/el/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -90,47 +90,47 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ msgid "Couldn't update app." msgstr "Αδυναμία ενημέρωσης εφαρμογής" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Ενημέρωση σε {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Απενεργοποίηση" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Ενεργοποίηση" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Παρακαλώ περιμένετε..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Ενημέρωση..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Σφάλμα" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Ενημέρωση" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Ενημερώθηκε" diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index f01616c71f5..ac03107faae 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index 8bc849cef43..e87a1af40e5 100644 --- a/l10n/en@pirate/core.po +++ b/l10n/en@pirate/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -171,55 +171,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -403,7 +403,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po index 35c76d3b04b..4663eb69623 100644 --- a/l10n/en@pirate/files_sharing.po +++ b/l10n/en@pirate/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s shared the folder %s with you" msgid "%s shared the file %s with you" msgstr "%s shared the file %s with you" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Download" @@ -76,6 +76,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "No preview available for" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 95bb346d1a1..abcc7173b51 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po index 9c7f4649db7..22391f10ba9 100644 --- a/l10n/en@pirate/user_ldap.po +++ b/l10n/en@pirate/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index 95570ce896f..a1ed07591e2 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -171,55 +171,55 @@ msgstr "December" msgid "Settings" msgstr "Settings" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "today" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "yesterday" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "last month" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "months ago" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "last year" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "years ago" @@ -403,7 +403,7 @@ msgstr "The update was unsuccessful. Please report this issue to the \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s shared the folder %s with you" msgid "%s shared the file %s with you" msgstr "%s shared the file %s with you" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Download" @@ -76,6 +76,6 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Cancel upload" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "No preview available for" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index ece8bf22f34..80f13d40670 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/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: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-29 16:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po index 8ea95e2d3bd..419452929a1 100644 --- a/l10n/en_GB/user_ldap.po +++ b/l10n/en_GB/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index dd1d6ebc5e2..3b30cee8181 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "Decembro" msgid "Settings" msgstr "Agordo" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekundoj antaŭe" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hodiaŭ" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "hieraŭ" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "lastamonate" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "monatoj antaŭe" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "lastajare" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "jaroj antaŭe" @@ -404,7 +404,7 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s kunhavigis la dosierujon %s kun vi" msgid "%s shared the file %s with you" msgstr "%s kunhavigis la dosieron %s kun vi" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Elŝuti" @@ -75,6 +75,6 @@ msgstr "Alŝuti" msgid "Cancel upload" msgstr "Nuligi alŝuton" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Ne haveblas antaŭvido por" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index e45c1e0d27b..829bdd3e116 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Malkapabligi" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Kapabligi" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Eraro" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Ĝisdatigi" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index 40492891983..ea6f21e2c88 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/es/core.po b/l10n/es/core.po index 8532b677a0e..5939a1c04f7 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 18:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -412,7 +412,7 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "%s restablecer contraseña" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 42ee5e09a55..7fa3515a060 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 832f5589c97..d1b498f5a0b 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 18:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 18:41+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -181,7 +181,7 @@ msgstr "%s ingresar el nombre de la base de datos" #: setup/abstractdatabase.php:28 #, php-format msgid "%s you may not use dots in the database name" -msgstr "%s no se puede utilizar puntos en el nombre de la base de datos" +msgstr "%s puede utilizar puntos en el nombre de la base de datos" #: setup/mssql.php:20 #, php-format diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 6857ff3c759..7dd98054072 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 21:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: eadeprado \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index 3a30c965c33..57518940037 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 17:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 18:23+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 6dd2898c492..be8c46730fc 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,55 +171,55 @@ msgstr "diciembre" msgid "Settings" msgstr "Configuración" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoy" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ayer" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "el mes pasado" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "meses atrás" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "el año pasado" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "años atrás" @@ -403,7 +403,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po index 7c6c7ae472c..c01c38b8342 100644 --- a/l10n/es_AR/files_encryption.po +++ b/l10n/es_AR/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # cjtess , 2013 +# cnngimenez, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-06 20:20+0000\n" +"Last-Translator: cnngimenez\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" @@ -62,20 +63,20 @@ msgid "" "files." msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Los siguientes usuarios no fueron configurados para encriptar:" #: js/settings-admin.js:11 msgid "Saving..." diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index b2d33b62c59..9bdc2244b46 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -64,7 +64,7 @@ msgstr "%s compartió la carpeta %s con vos" msgid "%s shared the file %s with you" msgstr "%s compartió el archivo %s con vos" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Descargar" @@ -76,6 +76,6 @@ msgstr "Subir" msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "La vista preliminar no está disponible para" diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po index 47441f17a35..91f5d7e581f 100644 --- a/l10n/es_AR/files_versions.po +++ b/l10n/es_AR/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# cnngimenez, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-06 20:00+0000\n" +"Last-Translator: cnngimenez\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" @@ -28,16 +29,16 @@ msgstr "Versiones" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Falló al revertir {file} a la revisión {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "Más versiones..." #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "No hay más versiones disponibles" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Recuperar" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 94c0ce3af87..77b82de7814 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -5,13 +5,14 @@ # Translators: # Agustin Ferrario , 2013 # cjtess , 2013 +# cnngimenez, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-06 20:00+0000\n" +"Last-Translator: cnngimenez\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" @@ -86,53 +87,53 @@ msgstr "No es posible borrar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la App." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar a {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactivar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Por favor, esperá...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Se ha producido un error mientras se deshabilitaba la aplicación" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Se ha producido un error mientras se habilitaba la aplicación" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Actualizando...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Error al actualizar App" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Error" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizado" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Desencriptando archivos... Por favor espere, esto puede tardar." #: js/personal.js:172 msgid "Saving..." @@ -194,7 +195,7 @@ msgid "" "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 "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web." #: templates/admin.php:29 msgid "Setup Warning" @@ -209,7 +210,7 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Por favor, cheque bien la guía de instalación." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -231,7 +232,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -244,7 +245,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características." #: templates/admin.php:92 msgid "Cron" @@ -258,11 +259,11 @@ msgstr "Ejecutá una tarea con cada pagina cargada." msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto." #: templates/admin.php:120 msgid "Sharing" @@ -320,14 +321,14 @@ msgstr "Forzar HTTPS" #: templates/admin.php:185 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "" +msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada." #: templates/admin.php:191 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL" #: templates/admin.php:203 msgid "Log" @@ -481,15 +482,15 @@ msgstr "Encriptación" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Clave de acceso" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Desencriptar todos los archivos" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 2e1635a672f..e260f9f562c 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po index e40f809b1bf..ce23b27c7bf 100644 --- a/l10n/es_AR/user_webdavauth.po +++ b/l10n/es_AR/user_webdavauth.po @@ -6,13 +6,14 @@ # Agustin Ferrario , 2012 # cjtess , 2013 # cjtess , 2012 +# cnngimenez, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-06 19:30+0000\n" +"Last-Translator: cnngimenez\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" @@ -22,15 +23,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "Autenticación de WevDAV" +msgstr "Autenticación de WebDAV" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Dirección:" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida." diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po new file mode 100644 index 00000000000..737f1b2a718 --- /dev/null +++ b/l10n/es_MX/core.po @@ -0,0 +1,647 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: ajax/share.php:227 +msgid "group" +msgstr "" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "" + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:33 +msgid "Monday" +msgstr "" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "" + +#: js/config.php:36 +msgid "Thursday" +msgstr "" + +#: js/config.php:37 +msgid "Friday" +msgstr "" + +#: js/config.php:38 +msgid "Saturday" +msgstr "" + +#: js/config.php:43 +msgid "January" +msgstr "" + +#: js/config.php:44 +msgid "February" +msgstr "" + +#: js/config.php:45 +msgid "March" +msgstr "" + +#: js/config.php:46 +msgid "April" +msgstr "" + +#: js/config.php:47 +msgid "May" +msgstr "" + +#: js/config.php:48 +msgid "June" +msgstr "" + +#: js/config.php:49 +msgid "July" +msgstr "" + +#: js/config.php:50 +msgid "August" +msgstr "" + +#: js/config.php:51 +msgid "September" +msgstr "" + +#: js/config.php:52 +msgid "October" +msgstr "" + +#: js/config.php:53 +msgid "November" +msgstr "" + +#: js/config.php:54 +msgid "December" +msgstr "" + +#: js/js.js:355 +msgid "Settings" +msgstr "" + +#: js/js.js:821 +msgid "seconds ago" +msgstr "" + +#: js/js.js:822 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:823 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:824 +msgid "today" +msgstr "" + +#: js/js.js:825 +msgid "yesterday" +msgstr "" + +#: js/js.js:826 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:827 +msgid "last month" +msgstr "" + +#: js/js.js:828 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:829 +msgid "months ago" +msgstr "" + +#: js/js.js:830 +msgid "last year" +msgstr "" + +#: js/js.js:831 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:210 +msgid "Error loading file picker template" +msgstr "" + +#: js/oc-dialogs.js:168 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:178 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:195 +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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:643 js/share.js:655 +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:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "" + +#: js/share.js:90 +msgid "Share" +msgstr "" + +#: js/share.js:131 js/share.js:683 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:183 +msgid "Share with" +msgstr "" + +#: js/share.js:188 +msgid "Share with link" +msgstr "" + +#: js/share.js:191 +msgid "Password protect" +msgstr "" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "" + +#: js/share.js:203 +msgid "Send" +msgstr "" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Share via email:" +msgstr "" + +#: js/share.js:243 +msgid "No people found" +msgstr "" + +#: js/share.js:281 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:317 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:338 +msgid "Unshare" +msgstr "" + +#: js/share.js:350 +msgid "can edit" +msgstr "" + +#: js/share.js:352 +msgid "access control" +msgstr "" + +#: js/share.js:355 +msgid "create" +msgstr "" + +#: js/share.js:358 +msgid "update" +msgstr "" + +#: js/share.js:361 +msgid "delete" +msgstr "" + +#: js/share.js:364 +msgid "share" +msgstr "" + +#: js/share.js:398 js/share.js:630 +msgid "Password protected" +msgstr "" + +#: js/share.js:643 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:655 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:670 +msgid "Sending ..." +msgstr "" + +#: js/share.js:681 +msgid "Email sent" +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:62 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
      If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
      If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
      Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +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 templates/layout.user.php:105 +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:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:33 +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:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:66 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:37 +msgid "remember" +msgstr "" + +#: templates/login.php:39 +msgid "Log in" +msgstr "" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po new file mode 100644 index 00000000000..0e1dc47804e --- /dev/null +++ b/l10n/es_MX/files.po @@ -0,0 +1,335 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:12 +msgid "Files" +msgstr "" + +#: js/file-upload.js:11 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:24 +msgid "Not enough space available" +msgstr "" + +#: js/file-upload.js:64 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:165 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:239 +msgid "URL cannot be empty." +msgstr "" + +#: js/file-upload.js:244 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "" + +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +msgid "Error" +msgstr "" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "" + +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +msgid "Pending" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "replace" +msgstr "" + +#: js/filelist.js:307 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "cancel" +msgstr "" + +#: js/filelist.js:354 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:354 +msgid "undo" +msgstr "" + +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:432 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:563 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:628 +msgid "files uploading" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/files.js:245 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:563 templates/index.php:69 +msgid "Name" +msgstr "" + +#: js/files.js:564 templates/index.php:81 +msgid "Size" +msgstr "" + +#: js/files.js:565 templates/index.php:83 +msgid "Modified" +msgstr "" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:41 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:52 +msgid "You don’t have write permissions here." +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:75 +msgid "Download" +msgstr "" + +#: templates/index.php:88 templates/index.php:89 +msgid "Unshare" +msgstr "" + +#: templates/index.php:94 templates/index.php:95 +msgid "Delete" +msgstr "" + +#: templates/index.php:108 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:110 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:115 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:118 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po new file mode 100644 index 00000000000..0aa9dac6488 --- /dev/null +++ b/l10n/es_MX/files_encryption.po @@ -0,0 +1,176 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: hooks/hooks.php:51 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:52 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "" + +#: hooks/hooks.php:250 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "" + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po new file mode 100644 index 00000000000..a6b6cd618ba --- /dev/null +++ b/l10n/es_MX/files_external.po @@ -0,0 +1,123 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:453 +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:457 +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 "" + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:12 +msgid "Options" +msgstr "" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:90 +msgid "None set" +msgstr "" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "" + +#: templates/settings.php:100 +msgid "Users" +msgstr "" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po new file mode 100644 index 00000000000..3cce6ac339f --- /dev/null +++ b/l10n/es_MX/files_sharing.po @@ -0,0 +1,80 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:26 templates/public.php:92 +msgid "Download" +msgstr "" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "" + +#: templates/public.php:89 +msgid "No preview available for" +msgstr "" diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po new file mode 100644 index 00000000000..42fb8a7b1f2 --- /dev/null +++ b/l10n/es_MX/files_trashbin.po @@ -0,0 +1,84 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:184 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:185 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:193 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/trash.js:199 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "" diff --git a/l10n/es_MX/files_versions.po b/l10n/es_MX/files_versions.po new file mode 100644 index 00000000000..b1866ae6ce3 --- /dev/null +++ b/l10n/es_MX/files_versions.po @@ -0,0 +1,43 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:7 +msgid "Versions" +msgstr "" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:79 +msgid "More versions..." +msgstr "" + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:145 +msgid "Restore" +msgstr "" diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po new file mode 100644 index 00000000000..89354b5767a --- /dev/null +++ b/l10n/es_MX/lib.po @@ -0,0 +1,322 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: app.php:250 +msgid "No app name specified" +msgstr "" + +#: app.php:361 +msgid "Help" +msgstr "" + +#: app.php:374 +msgid "Personal" +msgstr "" + +#: app.php:385 +msgid "Settings" +msgstr "" + +#: app.php:397 +msgid "Users" +msgstr "" + +#: app.php:410 +msgid "Admin" +msgstr "" + +#: app.php:837 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "" + +#: installer.php:123 +msgid "App does not provide an info.xml file" +msgstr "" + +#: installer.php:129 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: installer.php:138 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: installer.php:144 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: installer.php:150 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: installer.php:160 +msgid "App directory already exists" +msgstr "" + +#: installer.php:173 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template/functions.php:96 +msgid "seconds ago" +msgstr "" + +#: template/functions.php:97 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:98 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:99 +msgid "today" +msgstr "" + +#: template/functions.php:100 +msgid "yesterday" +msgstr "" + +#: template/functions.php:101 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:102 +msgid "last month" +msgstr "" + +#: template/functions.php:103 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:104 +msgid "last year" +msgstr "" + +#: template/functions.php:105 +msgid "years ago" +msgstr "" + +#: template.php:297 +msgid "Caused by:" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po new file mode 100644 index 00000000000..312c3c05b4b --- /dev/null +++ b/l10n/es_MX/settings.po @@ -0,0 +1,540 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "" + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:126 +msgid "Error" +msgstr "" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "" + +#: js/apps.js:130 +msgid "Updated" +msgstr "" + +#: js/personal.js:150 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:172 +msgid "Saving..." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 +msgid "Groups" +msgstr "" + +#: js/users.js:97 templates/users.php:89 templates/users.php:124 +msgid "Group Admin" +msgstr "" + +#: js/users.js:120 templates/users.php:164 +msgid "Delete" +msgstr "" + +#: js/users.js:277 +msgid "add group" +msgstr "" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:40 personal.php:41 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "" + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:92 +msgid "Cron" +msgstr "" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "" + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "" + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:170 +msgid "Security" +msgstr "" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:203 +msgid "Log" +msgstr "" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "" + +#: templates/admin.php:235 +msgid "More" +msgstr "" + +#: templates/admin.php:236 +msgid "Less" +msgstr "" + +#: templates/admin.php:242 templates/personal.php:140 +msgid "Version" +msgstr "" + +#: templates/admin.php:246 templates/personal.php:143 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:86 +msgid "Password" +msgstr "" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:44 +msgid "New password" +msgstr "" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "" + +#: templates/personal.php:58 templates/users.php:85 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:73 +msgid "Email" +msgstr "" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:85 templates/personal.php:86 +msgid "Language" +msgstr "" + +#: templates/personal.php:98 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:104 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:106 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "" + +#: templates/personal.php:117 +msgid "Encryption" +msgstr "" + +#: templates/personal.php:119 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "" + +#: templates/personal.php:125 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:130 +msgid "Decrypt all Files" +msgstr "" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "" + +#: templates/users.php:30 +msgid "Create" +msgstr "" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:48 templates/users.php:142 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:66 templates/users.php:157 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Username" +msgstr "" + +#: templates/users.php:91 +msgid "Storage" +msgstr "" + +#: templates/users.php:102 +msgid "change display name" +msgstr "" + +#: templates/users.php:106 +msgid "set new password" +msgstr "" + +#: templates/users.php:137 +msgid "Default" +msgstr "" diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po new file mode 100644 index 00000000000..54dc1b5192a --- /dev/null +++ b/l10n/es_MX/user_ldap.po @@ -0,0 +1,406 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:112 +msgid "Success" +msgstr "" + +#: js/settings.js:117 +msgid "Error" +msgstr "" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:37 +msgid "Host" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "" + +#: templates/settings.php:46 +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:47 +msgid "Password" +msgstr "" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:69 +msgid "Port" +msgstr "" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "" + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "" + +#: templates/settings.php:108 +msgid "Help" +msgstr "" diff --git a/l10n/es_MX/user_webdavauth.po b/l10n/es_MX/user_webdavauth.po new file mode 100644 index 00000000000..9948a588c8b --- /dev/null +++ b/l10n/es_MX/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "" + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 95b66e51b7a..fdfe37bfc2e 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -172,55 +172,55 @@ msgstr "Detsember" msgid "Settings" msgstr "Seaded" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekundit tagasi" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut tagasi" msgstr[1] "%n minutit tagasi" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tund tagasi" msgstr[1] "%n tundi tagasi" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "täna" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "eile" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päev tagasi" msgstr[1] "%n päeva tagasi" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "viimasel kuul" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuu tagasi" msgstr[1] "%n kuud tagasi" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "kuu tagasi" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "viimasel aastal" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "aastat tagasi" @@ -404,7 +404,7 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s jagas sinuga kausta %s" msgid "%s shared the file %s with you" msgstr "%s jagas sinuga faili %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Lae alla" @@ -77,6 +77,6 @@ msgstr "Lae üles" msgid "Cancel upload" msgstr "Tühista üleslaadimine" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Eelvaadet pole saadaval" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 26f50de9298..5b7ce1cef05 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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 05:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -86,47 +86,47 @@ msgstr "Kasutajat ei saa eemaldada grupist %s" msgid "Couldn't update app." msgstr "Rakenduse uuendamine ebaõnnestus." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Uuenda versioonile {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Lülita välja" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Lülita sisse" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Palun oota..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Viga rakendi keelamisel" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Viga rakendi lubamisel" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Uuendamine..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Viga rakenduse uuendamisel" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Viga" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Uuenda" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Uuendatud" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index f0267918f4d..bdc18ee7dba 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-22 10:36-0400\n" -"PO-Revision-Date: 2013-08-22 09:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 962c4efed51..07627d19b1b 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "Abendua" msgid "Settings" msgstr "Ezarpenak" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segundu" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "orain dela minutu %n" msgstr[1] "orain dela %n minutu" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "orain dela ordu %n" msgstr[1] "orain dela %n ordu" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "gaur" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "atzo" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "orain dela egun %n" msgstr[1] "orain dela %n egun" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "joan den hilabetean" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "orain dela hilabete %n" msgstr[1] "orain dela %n hilabete" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "hilabete" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "joan den urtean" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "urte" @@ -404,7 +404,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%sk zurekin %s karpeta elkarbanatu du" msgid "%s shared the file %s with you" msgstr "%sk zurekin %s fitxategia elkarbanatu du" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Deskargatu" @@ -76,6 +76,6 @@ msgstr "Igo" msgid "Cancel upload" msgstr "Ezeztatu igoera" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Ez dago aurrebista eskuragarririk hauentzat " diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 617d57288fe..9d8997f6f9d 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -86,47 +86,47 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu" msgid "Couldn't update app." msgstr "Ezin izan da aplikazioa eguneratu." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Eguneratu {appversion}-ra" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Ez-gaitu" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Gaitu" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Itxoin mesedez..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Eguneratzen..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Errorea aplikazioa eguneratzen zen bitartean" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Errorea" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Eguneratu" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Eguneratuta" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index e9c2fb101c7..7712a3e1d18 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index 477f3475fc5..7270da2b1c1 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -171,51 +171,51 @@ msgstr "دسامبر" msgid "Settings" msgstr "تنظیمات" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "ثانیه‌ها پیش" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "امروز" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "دیروز" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "ماه قبل" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "ماه‌های قبل" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "سال قبل" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "سال‌های قبل" @@ -399,7 +399,7 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را msgid "The update was successful. Redirecting you to ownCloud now." msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po index 84ebd4737a2..b14ebbf89df 100644 --- a/l10n/fa/files_sharing.po +++ b/l10n/fa/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -64,7 +64,7 @@ msgstr "%sپوشه %s را با شما به اشتراک گذاشت" msgid "%s shared the file %s with you" msgstr "%sفایل %s را با شما به اشتراک گذاشت" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "دانلود" @@ -76,6 +76,6 @@ msgstr "بارگزاری" msgid "Cancel upload" msgstr "متوقف کردن بار گذاری" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "هیچگونه پیش نمایشی موجود نیست" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 015429708da..70df68704d2 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "امکان حذف کاربر از گروه %s نیست" msgid "Couldn't update app." msgstr "برنامه را نمی توان به هنگام ساخت." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "بهنگام شده به {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "غیرفعال" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "فعال" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "لطفا صبر کنید ..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "در حال بروز رسانی..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "خطا در هنگام بهنگام سازی برنامه" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "خطا" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "به روز رسانی" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "بروز رسانی انجام شد" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index dabbd41a9ce..9496f287201 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index f76c82e4827..26e5f4c8578 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "joulukuu" msgid "Settings" msgstr "Asetukset" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekuntia sitten" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuutti sitten" msgstr[1] "%n minuuttia sitten" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tunti sitten" msgstr[1] "%n tuntia sitten" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "tänään" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "eilen" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päivä sitten" msgstr[1] "%n päivää sitten" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "viime kuussa" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuukausi sitten" msgstr[1] "%n kuukautta sitten" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "kuukautta sitten" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "viime vuonna" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "vuotta sitten" @@ -404,7 +404,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s jakoi kansion %s kanssasi" msgid "%s shared the file %s with you" msgstr "%s jakoi tiedoston %s kanssasi" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Lataa" @@ -76,6 +76,6 @@ msgstr "Lähetä" msgid "Cancel upload" msgstr "Peru lähetys" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Ei esikatselua kohteelle" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 92f6acfd299..78daad02a6e 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 06:20+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -85,47 +85,47 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu" msgid "Couldn't update app." msgstr "Sovelluksen päivitys epäonnistui." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Päivitä versioon {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Poista käytöstä" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Käytä" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Odota hetki..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Virhe poistaessa sovellusta käytöstä" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Virhe ottaessa sovellusta käyttöön" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Päivitetään..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Virhe sovellusta päivittäessä" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Virhe" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Päivitä" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Päivitetty" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index 394517b9292..fb7a0366048 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 4215f9dc597..b36056d3db6 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" -"PO-Revision-Date: 2013-09-03 09:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -175,55 +175,55 @@ msgstr "décembre" msgid "Settings" msgstr "Paramètres" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "il y a %n minute" msgstr[1] "il y a %n minutes" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Il y a %n heure" msgstr[1] "Il y a %n heures" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "aujourd'hui" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "hier" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "il y a %n jour" msgstr[1] "il y a %n jours" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "le mois dernier" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Il y a %n mois" msgstr[1] "Il y a %n mois" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "il y a plusieurs mois" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "l'année dernière" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "il y a plusieurs années" @@ -407,7 +407,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la , 2013 # Christophe Lherieau , 2013 # MathieuP , 2013 +# ogre_sympathique , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:42-0400\n" -"PO-Revision-Date: 2013-09-03 09:25+0000\n" -"Last-Translator: Christophe Lherieau \n" +"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-06 15:50+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -49,13 +50,13 @@ msgstr "Aucune erreur, le fichier a été envoyé avec succès." #: ajax/upload.php:67 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:" +msgstr "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:" #: ajax/upload.php:69 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" -msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML." +msgstr "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML." #: ajax/upload.php:70 msgid "The uploaded file was only partially uploaded" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index 6f0ea28d9c5..581738c45f6 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:43-0400\n" -"PO-Revision-Date: 2013-09-03 11:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index fd619afbb0c..bbb0ba9335f 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:44-0400\n" -"PO-Revision-Date: 2013-09-03 09:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 4da048e30f4..5d5731c1575 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 12:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index 3766c1513c8..ef68307bdd2 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -7,15 +7,16 @@ # Christophe Lherieau , 2013 # mishka, 2013 # ouafnico , 2012 +# ogre_sympathique , 2013 # Robert Di Rosa <>, 2012 # Romain DEP. , 2012-2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-04 11:00+0000\n" -"Last-Translator: yann_hellier \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-06 13:50+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -25,7 +26,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Authentification WebDAV" #: templates/settings.php:4 msgid "Address: " diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 6565f0ea8d9..953c2500a16 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,55 +171,55 @@ msgstr "decembro" msgid "Settings" msgstr "Axustes" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "hai %n minuto" msgstr[1] "hai %n minutos" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "hai %n hora" msgstr[1] "hai %n horas" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoxe" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "onte" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "hai %n día" msgstr[1] "hai %n días" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "último mes" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "hai %n mes" msgstr[1] "hai %n meses" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "meses atrás" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "último ano" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anos atrás" @@ -403,7 +403,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s compartiu o cartafol %s con vostede" msgid "%s shared the file %s with you" msgstr "%s compartiu o ficheiro %s con vostede" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Descargar" @@ -76,6 +76,6 @@ msgstr "Enviar" msgid "Cancel upload" msgstr "Cancelar o envío" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Sen vista previa dispoñíbel para" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index e04bf9e31b2..4ae06757f52 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/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: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-28 22:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index 5e1d0d000e3..54fdccd2c35 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:11-0400\n" -"PO-Revision-Date: 2013-08-20 11:20+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/core.po b/l10n/he/core.po index a505ffebd53..b129f093b45 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "דצמבר" msgid "Settings" msgstr "הגדרות" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "שניות" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "לפני %n דקה" msgstr[1] "לפני %n דקות" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "לפני %n שעה" msgstr[1] "לפני %n שעות" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "היום" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "אתמול" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "לפני %n יום" msgstr[1] "לפני %n ימים" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "חודש שעבר" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "לפני %n חודש" msgstr[1] "לפני %n חודשים" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "חודשים" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "שנה שעברה" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "שנים" @@ -404,7 +404,7 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את msgid "The update was successful. Redirecting you to ownCloud now." msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po index 0af4dee2ecc..c7274f6691f 100644 --- a/l10n/he/files_sharing.po +++ b/l10n/he/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s שיתף עמך את התיקייה %s" msgid "%s shared the file %s with you" msgstr "%s שיתף עמך את הקובץ %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "הורדה" @@ -75,6 +75,6 @@ msgstr "העלאה" msgid "Cancel upload" msgstr "ביטול ההעלאה" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "אין תצוגה מקדימה זמינה עבור" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 767a3252701..a4c9254b6aa 100644 --- a/l10n/he/settings.po +++ b/l10n/he/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s" msgid "Couldn't update app." msgstr "לא ניתן לעדכן את היישום." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "עדכון לגרסה {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "בטל" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "הפעלה" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "נא להמתין…" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "מתבצע עדכון…" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "אירעה שגיאה בעת עדכון היישום" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "שגיאה" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "עדכון" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "מעודכן" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index af6906d1973..23b74eb81c3 100644 --- a/l10n/he/user_ldap.po +++ b/l10n/he/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index dd5f832c464..86ffaca9ab6 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/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: 2013-09-03 07:43-0400\n" -"PO-Revision-Date: 2013-09-03 11:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: Debanjum \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -172,55 +172,55 @@ msgstr "दिसम्बर" msgid "Settings" msgstr "सेटिंग्स" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -404,7 +404,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po index 1b0fd22ba82..c9f6dc720fd 100644 --- a/l10n/hi/files_sharing.po +++ b/l10n/hi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-04 01:55-0400\n" -"PO-Revision-Date: 2013-08-04 05:02+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index dc541066ba0..21d4d87892b 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "त्रुटि" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "अद्यतन" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po index 053000fe64c..61c20ec6171 100644 --- a/l10n/hi/user_ldap.po +++ b/l10n/hi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index 693dc056589..5a976319906 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,59 +170,59 @@ msgstr "Prosinac" msgid "Settings" msgstr "Postavke" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekundi prije" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "danas" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "jučer" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "prošli mjesec" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mjeseci" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "prošlu godinu" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "godina" @@ -406,7 +406,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po index ee7cc3cc679..5d9fd41cb78 100644 --- a/l10n/hr/files_sharing.po +++ b/l10n/hr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Preuzimanje" @@ -75,6 +75,6 @@ msgstr "Učitaj" msgid "Cancel upload" msgstr "Prekini upload" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index a1d1484aab7..7837d0febac 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Isključi" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Uključi" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Greška" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index bbd09586144..1d665b257f6 100644 --- a/l10n/hr/user_ldap.po +++ b/l10n/hr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index b4bbc396445..871561f5daa 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "december" msgid "Settings" msgstr "Beállítások" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "pár másodperce" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "ma" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "tegnap" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "múlt hónapban" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "több hónapja" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "tavaly" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "több éve" @@ -404,7 +404,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 43059eac1fc..9e79db98f68 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -64,7 +64,7 @@ msgstr "%s megosztotta Önnel ezt a mappát: %s" msgid "%s shared the file %s with you" msgstr "%s megosztotta Önnel ezt az állományt: %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Letöltés" @@ -76,6 +76,6 @@ msgstr "Feltöltés" msgid "Cancel upload" msgstr "A feltöltés megszakítása" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Nem áll rendelkezésre előnézet ehhez: " diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index a04fb4488ea..52e0ec6ab15 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -87,47 +87,47 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s" msgid "Couldn't update app." msgstr "A program frissítése nem sikerült." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Frissítés erre a verzióra: {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Letiltás" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "engedélyezve" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Kérem várjon..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Frissítés folyamatban..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Hiba történt a programfrissítés közben" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Hiba" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Frissítés" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Frissítve" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 166a16c7f81..5b24b22ffd6 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 7dfa76c49ea..bf61a23d0d4 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configurationes" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po index 6fb91fb6c7e..279865aadcc 100644 --- a/l10n/ia/files_sharing.po +++ b/l10n/ia/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Discargar" @@ -75,6 +75,6 @@ msgstr "Incargar" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index d43c46e1de0..465b88cf010 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Error" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualisar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index a8bd30ff193..d67d3ec71b9 100644 --- a/l10n/ia/user_ldap.po +++ b/l10n/ia/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/id/core.po b/l10n/id/core.po index 071ac769a96..1c17fc9a1de 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,51 +170,51 @@ msgstr "Desember" msgid "Settings" msgstr "Setelan" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hari ini" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "kemarin" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "bulan kemarin" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "beberapa bulan lalu" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "tahun kemarin" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "beberapa tahun lalu" @@ -398,7 +398,7 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s membagikan folder %s dengan Anda" msgid "%s shared the file %s with you" msgstr "%s membagikan file %s dengan Anda" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Unduh" @@ -75,6 +75,6 @@ msgstr "Unggah" msgid "Cancel upload" msgstr "Batal pengunggahan" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Tidak ada pratinjau tersedia untuk" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 4940f179f89..33c557825d5 100644 --- a/l10n/id/settings.po +++ b/l10n/id/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s" msgid "Couldn't update app." msgstr "Tidak dapat memperbarui aplikasi." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Perbarui ke {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Nonaktifkan" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "aktifkan" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Mohon tunggu...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Memperbarui...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Gagal ketika memperbarui aplikasi" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Galat" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Perbarui" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Diperbarui" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index e165b0b8d33..bb775d8df95 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/is/core.po b/l10n/is/core.po index 643a8c16821..a4202c883c6 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,55 +171,55 @@ msgstr "Desember" msgid "Settings" msgstr "Stillingar" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sek." -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "í dag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "í gær" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "síðasta mánuði" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mánuðir síðan" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "síðasta ári" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "einhverjum árum" @@ -403,7 +403,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index 20e744006b8..836b3e5bb60 100644 --- a/l10n/is/files_sharing.po +++ b/l10n/is/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s deildi möppunni %s með þér" msgid "%s shared the file %s with you" msgstr "%s deildi skránni %s með þér" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Niðurhal" @@ -75,6 +75,6 @@ msgstr "Senda inn" msgid "Cancel upload" msgstr "Hætta við innsendingu" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Yfirlit ekki í boði fyrir" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 5f777e83b7c..52e3e20debc 100644 --- a/l10n/is/settings.po +++ b/l10n/is/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Gera óvirkt" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Virkja" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Andartak...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Uppfæri..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Villa" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Uppfæra" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Uppfært" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 389e4c206ef..5f4609f359b 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/it/core.po b/l10n/it/core.po index e5cdd51793d..a1df98badc5 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:52+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" @@ -173,55 +173,55 @@ msgstr "Dicembre" msgid "Settings" msgstr "Impostazioni" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "secondi fa" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "oggi" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ieri" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "mese scorso" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mesi fa" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "anno scorso" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anni fa" @@ -405,7 +405,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s ha condiviso la cartella %s con te" msgid "%s shared the file %s with you" msgstr "%s ha condiviso il file %s con te" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Scarica" @@ -77,6 +77,6 @@ msgstr "Carica" msgid "Cancel upload" msgstr "Annulla il caricamento" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Nessuna anteprima disponibile per" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 2ef86dac439..8796242725a 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 15:53+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index e39ae95e863..5e50a6b6e65 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 06:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 38ce1ffd25b..913bf45fdcc 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 09:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: plazmism \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -174,51 +174,51 @@ msgstr "12月" msgid "Settings" msgstr "設定" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "数秒前" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分前" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 時間後" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "今日" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "昨日" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 日後" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "一月前" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n カ月後" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "月前" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "一年前" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "年前" @@ -402,7 +402,7 @@ msgstr "更新に成功しました。この問題を \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s はフォルダー %s をあなたと共有中です" msgid "%s shared the file %s with you" msgstr "%s はファイル %s をあなたと共有中です" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "ダウンロード" @@ -76,6 +76,6 @@ msgstr "アップロード" msgid "Cancel upload" msgstr "アップロードをキャンセル" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "プレビューはありません" diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index 78f82700487..a8475ee8c22 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# plazmism , 2013 # Koichi MATSUMOTO , 2013 # tt yn , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 01:10+0000\n" -"Last-Translator: tt yn \n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 15:30+0000\n" +"Last-Translator: plazmism \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" @@ -125,7 +126,7 @@ msgstr "アプリは、このバージョンのownCloudと互換性がない為 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "非shippedアプリには許可されないtrueタグが含まれているためにアプリをインストール出来ません。" #: installer.php:150 msgid "" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index e265ca7d475..e42d2b3c762 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 00:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: tt yn \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po index cbbbfc99a47..9b1f34b05cf 100644 --- a/l10n/ja_JP/user_ldap.po +++ b/l10n/ja_JP/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:11-0400\n" -"PO-Revision-Date: 2013-08-20 09:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Daisuke Deguchi \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka/core.po b/l10n/ka/core.po index d8e95837373..f567d8ac98e 100644 --- a/l10n/ka/core.po +++ b/l10n/ka/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -170,51 +170,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "დღეს" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -398,7 +398,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po index 64ba6094207..efd2890682d 100644 --- a/l10n/ka/files_sharing.po +++ b/l10n/ka/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "გადმოწერა" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po index 079d74339ac..a3a8d3eba3a 100644 --- a/l10n/ka/settings.po +++ b/l10n/ka/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po index 537446f5b40..69f4675a9c6 100644 --- a/l10n/ka/user_ldap.po +++ b/l10n/ka/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 8cd45561ae0..66d5a94e1c3 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -170,51 +170,51 @@ msgstr "დეკემბერი" msgid "Settings" msgstr "პარამეტრები" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "დღეს" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "გასულ თვეში" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "თვის წინ" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "ბოლო წელს" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "წლის წინ" @@ -398,7 +398,7 @@ msgstr "განახლება ვერ განხორციელდ msgid "The update was successful. Redirecting you to ownCloud now." msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po index 65b24c1c116..febee9664fc 100644 --- a/l10n/ka_GE/files_sharing.po +++ b/l10n/ka_GE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s–მა გაგიზიარათ ფოლდერი %s" msgid "%s shared the file %s with you" msgstr "%s–მა გაგიზიარათ ფაილი %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "ჩამოტვირთვა" @@ -75,6 +75,6 @@ msgstr "ატვირთვა" msgid "Cancel upload" msgstr "ატვირთვის გაუქმება" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "წინასწარი დათვალიერება შეუძლებელია" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 793b41c51aa..7ac98114771 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ msgid "Couldn't update app." msgstr "ვერ მოხერხდა აპლიკაციის განახლება." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "განაახლე {appversion}–მდე" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "გამორთვა" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "ჩართვა" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "დაიცადეთ...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "მიმდინარეობს განახლება...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "შეცდომა აპლიკაციის განახლების დროს" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "შეცდომა" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "განახლება" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "განახლებულია" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index da010f03eee..36128b4046d 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index 5e7d67575a2..73bf9152063 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,51 +172,51 @@ msgstr "12월" msgid "Settings" msgstr "설정" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "초 전" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n분 전 " -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n시간 전 " -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "오늘" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "어제" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n일 전 " -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "지난 달" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n달 전 " -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "개월 전" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "작년" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "년 전" @@ -400,7 +400,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s 님이 폴더 %s을(를) 공유하였습니다" msgid "%s shared the file %s with you" msgstr "%s 님이 파일 %s을(를) 공유하였습니다" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "다운로드" @@ -75,6 +75,6 @@ msgstr "업로드" msgid "Cancel upload" msgstr "업로드 취소" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "다음 항목을 미리 볼 수 없음:" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 9556c8739f3..5836e16abbb 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음" msgid "Couldn't update app." msgstr "앱을 업데이트할 수 없습니다." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "버전 {appversion}(으)로 업데이트" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "비활성화" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "사용함" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "기다려 주십시오...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "업데이트 중...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "앱을 업데이트하는 중 오류 발생" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "오류" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "업데이트" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "업데이트됨" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index 903dc63b87f..1766fef5754 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index 1948a8cf5ea..65ffe9e63c8 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "" msgid "Settings" msgstr "ده‌ستكاری" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po index 83b88021ea2..1171bd5e1ae 100644 --- a/l10n/ku_IQ/files_sharing.po +++ b/l10n/ku_IQ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ msgid "%s shared the file %s with you" msgstr "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "داگرتن" @@ -75,6 +75,6 @@ msgstr "بارکردن" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index 943ca690406..e34460a4f06 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "چالاککردن" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "هه‌ڵه" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "نوێکردنه‌وه" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index c2ca53a1932..724271784b6 100644 --- a/l10n/ku_IQ/user_ldap.po +++ b/l10n/ku_IQ/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 73f9dacaf60..7e63c68833d 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,55 +171,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Astellungen" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "Sekonnen hir" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "haut" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "gëschter" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "leschte Mount" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "Méint hir" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "Lescht Joer" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "Joren hir" @@ -403,7 +403,7 @@ msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s huet den Dossier %s mad der gedeelt" msgid "%s shared the file %s with you" msgstr "%s deelt den Fichier %s mad dir" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Download" @@ -76,6 +76,6 @@ msgstr "Eroplueden" msgid "Cancel upload" msgstr "Upload ofbriechen" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Keeng Preview do fir" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 195b886e8d6..ac7677e1875 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Ofschalten" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aschalten" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fehler" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index 291529dde43..5b73ccc321a 100644 --- a/l10n/lb/user_ldap.po +++ b/l10n/lb/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 6f77486ddf4..e8292e89ce8 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -173,59 +173,59 @@ msgstr "Gruodis" msgid "Settings" msgstr "Nustatymai" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "prieš sekundę" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " prieš %n minutę" msgstr[1] " prieš %n minučių" msgstr[2] " prieš %n minučių" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "prieš %n valandą" msgstr[1] "prieš %n valandų" msgstr[2] "prieš %n valandų" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "šiandien" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "vakar" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "praeitą mėnesį" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "prieš %n mėnesį" msgstr[1] "prieš %n mėnesius" msgstr[2] "prieš %n mėnesių" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "prieš mėnesį" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "praeitais metais" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "prieš metus" @@ -409,7 +409,7 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s pasidalino su jumis %s aplanku" msgid "%s shared the file %s with you" msgstr "%s pasidalino su jumis %s failu" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Atsisiųsti" @@ -76,6 +76,6 @@ msgstr "Įkelti" msgid "Cancel upload" msgstr "Atšaukti siuntimą" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Peržiūra nėra galima" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 9f10ee721e5..b60503e50a5 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s" msgid "Couldn't update app." msgstr "Nepavyko atnaujinti programos." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atnaujinti iki {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Išjungti" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Įjungti" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Prašome palaukti..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Atnaujinama..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Įvyko klaida atnaujinant programą" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Klaida" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Atnaujinti" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Atnaujinta" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index af344de49a7..a9962fc3311 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 65e8cfde0e4..7c87f637dda 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,59 +171,59 @@ msgstr "Decembris" msgid "Settings" msgstr "Iestatījumi" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekundes atpakaļ" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Tagad, %n minūtes" msgstr[1] "Pirms %n minūtes" msgstr[2] "Pirms %n minūtēm" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Šodien, %n stundas" msgstr[1] "Pirms %n stundas" msgstr[2] "Pirms %n stundām" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "šodien" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "vakar" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Šodien, %n dienas" msgstr[1] "Pirms %n dienas" msgstr[2] "Pirms %n dienām" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "pagājušajā mēnesī" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Šomēnes, %n mēneši" msgstr[1] "Pirms %n mēneša" msgstr[2] "Pirms %n mēnešiem" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mēnešus atpakaļ" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "gājušajā gadā" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "gadus atpakaļ" @@ -407,7 +407,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "%s paroles maiņa" diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po index 71c4b1fd73f..8c5c1f01416 100644 --- a/l10n/lv/files_sharing.po +++ b/l10n/lv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s ar jums dalījās ar mapi %s" msgid "%s shared the file %s with you" msgstr "%s ar jums dalījās ar datni %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Lejupielādēt" @@ -75,6 +75,6 @@ msgstr "Augšupielādēt" msgid "Cancel upload" msgstr "Atcelt augšupielādi" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Nav pieejams priekšskatījums priekš" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index d3122ddf860..c27ebcce6d0 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "Nevar izņemt lietotāju no grupas %s" msgid "Couldn't update app." msgstr "Nevarēja atjaunināt lietotni." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atjaunināt uz {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktivēt" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktivēt" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Lūdzu, uzgaidiet...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Atjaunina...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Kļūda, atjauninot lietotni" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Kļūda" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Atjaunināt" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Atjaunināta" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index 3811f911bae..cd344fb96ce 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index a426e2ec182..14d322295f3 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "Декември" msgid "Settings" msgstr "Подесувања" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "пред секунди" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "денеска" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "вчера" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "минатиот месец" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "пред месеци" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "минатата година" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "пред години" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index f669e2ffd24..0ae038b02ec 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s ја сподели папката %s со Вас" msgid "%s shared the file %s with you" msgstr "%s ја сподели датотеката %s со Вас" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Преземи" @@ -75,6 +75,6 @@ msgstr "Подигни" msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Нема достапно преглед за" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index f607774bbaf..40f07233530 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Неможе да избришам корисник од група %s" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Оневозможи" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Овозможи" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Грешка" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Ажурирај" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 323404d6364..c1df01027fb 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 0e3255b6ebe..b7322371c61 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,51 +170,51 @@ msgstr "Disember" msgid "Settings" msgstr "Tetapan" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -398,7 +398,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po index 7ce6237f3d0..936e15a9ccf 100644 --- a/l10n/ms_MY/files_sharing.po +++ b/l10n/ms_MY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Muat turun" @@ -75,6 +75,6 @@ msgstr "Muat naik" msgid "Cancel upload" msgstr "Batal muat naik" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index f809ae90632..0efc0a627d8 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Nyahaktif" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktif" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Ralat" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Kemaskini" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index de6d8fa0134..403d5ac2ff3 100644 --- a/l10n/ms_MY/user_ldap.po +++ b/l10n/ms_MY/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 4a7e283b44c..6110b1cecb2 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -170,51 +170,51 @@ msgstr "ဒီဇင်ဘာ" msgid "Settings" msgstr "" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "စက္ကန့်အနည်းငယ်က" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "ယနေ့" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "မနေ့က" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "ပြီးခဲ့သောလ" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "မနှစ်က" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "နှစ် အရင်က" @@ -398,7 +398,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po index 77d34ee18f7..6b5c6c97692 100644 --- a/l10n/my_MM/files_sharing.po +++ b/l10n/my_MM/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "ဒေါင်းလုတ်" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index 94670f111b4..5eefdc2e422 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po index 62ed04aa882..cb30d0ff0f7 100644 --- a/l10n/my_MM/user_ldap.po +++ b/l10n/my_MM/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 68b8f11bed3..5a8f8a24b85 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,55 +171,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillinger" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "i dag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "i går" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "forrige måned" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "måneder siden" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "forrige år" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "år siden" @@ -403,7 +403,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index ccc3611f726..60ad1adffc2 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med deg" msgid "%s shared the file %s with you" msgstr "%s delte filen %s med deg" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Last ned" @@ -76,6 +76,6 @@ msgstr "Last opp" msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Forhåndsvisning ikke tilgjengelig for" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 98c0ccd9250..a3f2e936037 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -86,47 +86,47 @@ msgstr "Kan ikke slette bruker fra gruppen %s" msgid "Couldn't update app." msgstr "Kunne ikke oppdatere app." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Oppdater til {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Slå avBehandle " -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktiver" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Vennligst vent..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Oppdaterer..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Feil ved oppdatering av app" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Feil" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Oppdater" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Oppdatert" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index 037b9206594..52aa1d44d42 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index c7b2e1c117b..bbb049169c7 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -173,55 +173,55 @@ msgstr "december" msgid "Settings" msgstr "Instellingen" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "seconden geleden" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n minuten geleden" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n uur geleden" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "vandaag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "gisteren" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n dagen geleden" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "vorige maand" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n maanden geleden" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "maanden geleden" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "vorig jaar" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "jaar geleden" @@ -405,7 +405,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de \n" +"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-06 20:20+0000\n" +"Last-Translator: kwillems \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[1] "%n bestanden" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} en {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index a9f681aaee2..fd82bdc9534 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Len \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s deelt de map %s met u" msgid "%s shared the file %s with you" msgstr "%s deelt het bestand %s met u" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Downloaden" @@ -77,6 +77,6 @@ msgstr "Uploaden" msgid "Cancel upload" msgstr "Upload afbreken" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Geen voorbeeldweergave beschikbaar voor" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index fef0b93014e..eda06bc1e27 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: kwillems \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -88,47 +88,47 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s" msgid "Couldn't update app." msgstr "Kon de app niet bijwerken." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Bijwerken naar {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Uitschakelen" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activeer" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Even geduld aub...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Fout tijdens het uitzetten van het programma" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Fout tijdens het aanzetten van het programma" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Bijwerken...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Fout bij bijwerken app" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fout" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Bijwerken" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Bijgewerkt" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 61ed6bb4d84..b0ecf57ce45 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-23 20:16-0400\n" -"PO-Revision-Date: 2013-08-23 16:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: kwillems \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 8772791ae01..493954e8077 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillingar" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekund sidan" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "i dag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "i går" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "førre månad" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "månadar sidan" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "i fjor" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "år sidan" @@ -404,7 +404,7 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til \n" +"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-06 10:20+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +31,11 @@ msgstr "Klarte ikkje flytta %s" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "Klarte ikkje å endra opplastingsmappa." #: ajax/upload.php:22 msgid "Invalid Token" -msgstr "" +msgstr "Ugyldig token" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" @@ -160,24 +160,24 @@ msgstr "angre" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n mappe" +msgstr[1] "%n mapper" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n fil" +msgstr[1] "%n filer" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} og {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lastar opp %n fil" +msgstr[1] "Lastar opp %n filer" #: js/filelist.js:628 msgid "files uploading" @@ -209,7 +209,7 @@ msgstr "Lagringa di er nesten full ({usedSpacePercent} %)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar." #: js/files.js:245 msgid "" @@ -232,7 +232,7 @@ msgstr "Endra" #: lib/app.php:73 #, php-format msgid "%s could not be renamed" -msgstr "" +msgstr "Klarte ikkje å omdøypa på %s" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 53090ff185e..6e230da77ce 100644 --- a/l10n/nn_NO/files_sharing.po +++ b/l10n/nn_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -64,7 +64,7 @@ msgstr "%s delte mappa %s med deg" msgid "%s shared the file %s with you" msgstr "%s delte fila %s med deg" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Last ned" @@ -76,6 +76,6 @@ msgstr "Last opp" msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Inga førehandsvising tilgjengeleg for" diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po index c10ee6cd507..93f0ba9fd63 100644 --- a/l10n/nn_NO/files_trashbin.po +++ b/l10n/nn_NO/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-06 10:20+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" @@ -28,43 +28,43 @@ msgstr "Klarte ikkje sletta %s for godt" msgid "Couldn't restore %s" msgstr "Klarte ikkje gjenoppretta %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "utfør gjenoppretting" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Feil" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "slett fila for godt" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Slett for godt" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Namn" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Sletta" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n mapper" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n filer" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index f46da15c6e2..7c7314687bb 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -86,47 +86,47 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s" msgid "Couldn't update app." msgstr "Klarte ikkje oppdatera programmet." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Oppdater til {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Slå av" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Slå på" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Ver venleg og vent …" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Oppdaterer …" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Feil ved oppdatering av app" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Feil" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Oppdater" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Oppdatert" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index 8ded31122df..4113e6e91a1 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po new file mode 100644 index 00000000000..b0cbd8bf9f3 --- /dev/null +++ b/l10n/nqo/core.po @@ -0,0 +1,643 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: ajax/share.php:227 +msgid "group" +msgstr "" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "" + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:33 +msgid "Monday" +msgstr "" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "" + +#: js/config.php:36 +msgid "Thursday" +msgstr "" + +#: js/config.php:37 +msgid "Friday" +msgstr "" + +#: js/config.php:38 +msgid "Saturday" +msgstr "" + +#: js/config.php:43 +msgid "January" +msgstr "" + +#: js/config.php:44 +msgid "February" +msgstr "" + +#: js/config.php:45 +msgid "March" +msgstr "" + +#: js/config.php:46 +msgid "April" +msgstr "" + +#: js/config.php:47 +msgid "May" +msgstr "" + +#: js/config.php:48 +msgid "June" +msgstr "" + +#: js/config.php:49 +msgid "July" +msgstr "" + +#: js/config.php:50 +msgid "August" +msgstr "" + +#: js/config.php:51 +msgid "September" +msgstr "" + +#: js/config.php:52 +msgid "October" +msgstr "" + +#: js/config.php:53 +msgid "November" +msgstr "" + +#: js/config.php:54 +msgid "December" +msgstr "" + +#: js/js.js:355 +msgid "Settings" +msgstr "" + +#: js/js.js:821 +msgid "seconds ago" +msgstr "" + +#: js/js.js:822 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" + +#: js/js.js:823 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" + +#: js/js.js:824 +msgid "today" +msgstr "" + +#: js/js.js:825 +msgid "yesterday" +msgstr "" + +#: js/js.js:826 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" + +#: js/js.js:827 +msgid "last month" +msgstr "" + +#: js/js.js:828 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" + +#: js/js.js:829 +msgid "months ago" +msgstr "" + +#: js/js.js:830 +msgid "last year" +msgstr "" + +#: js/js.js:831 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:210 +msgid "Error loading file picker template" +msgstr "" + +#: js/oc-dialogs.js:168 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:178 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:195 +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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:643 js/share.js:655 +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:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "" + +#: js/share.js:90 +msgid "Share" +msgstr "" + +#: js/share.js:131 js/share.js:683 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:183 +msgid "Share with" +msgstr "" + +#: js/share.js:188 +msgid "Share with link" +msgstr "" + +#: js/share.js:191 +msgid "Password protect" +msgstr "" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "" + +#: js/share.js:203 +msgid "Send" +msgstr "" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Share via email:" +msgstr "" + +#: js/share.js:243 +msgid "No people found" +msgstr "" + +#: js/share.js:281 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:317 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:338 +msgid "Unshare" +msgstr "" + +#: js/share.js:350 +msgid "can edit" +msgstr "" + +#: js/share.js:352 +msgid "access control" +msgstr "" + +#: js/share.js:355 +msgid "create" +msgstr "" + +#: js/share.js:358 +msgid "update" +msgstr "" + +#: js/share.js:361 +msgid "delete" +msgstr "" + +#: js/share.js:364 +msgid "share" +msgstr "" + +#: js/share.js:398 js/share.js:630 +msgid "Password protected" +msgstr "" + +#: js/share.js:643 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:655 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:670 +msgid "Sending ..." +msgstr "" + +#: js/share.js:681 +msgid "Email sent" +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:62 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
      If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
      If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
      Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +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 templates/layout.user.php:105 +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:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:33 +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:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:66 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:37 +msgid "remember" +msgstr "" + +#: templates/login.php:39 +msgid "Log in" +msgstr "" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po new file mode 100644 index 00000000000..ee3f40afbc4 --- /dev/null +++ b/l10n/nqo/files.po @@ -0,0 +1,332 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:12 +msgid "Files" +msgstr "" + +#: js/file-upload.js:11 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:24 +msgid "Not enough space available" +msgstr "" + +#: js/file-upload.js:64 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:165 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:239 +msgid "URL cannot be empty." +msgstr "" + +#: js/file-upload.js:244 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "" + +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +msgid "Error" +msgstr "" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "" + +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +msgid "Pending" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "replace" +msgstr "" + +#: js/filelist.js:307 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "cancel" +msgstr "" + +#: js/filelist.js:354 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:354 +msgid "undo" +msgstr "" + +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:432 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:563 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" + +#: js/filelist.js:628 +msgid "files uploading" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/files.js:245 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:563 templates/index.php:69 +msgid "Name" +msgstr "" + +#: js/files.js:564 templates/index.php:81 +msgid "Size" +msgstr "" + +#: js/files.js:565 templates/index.php:83 +msgid "Modified" +msgstr "" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:41 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:52 +msgid "You don’t have write permissions here." +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:75 +msgid "Download" +msgstr "" + +#: templates/index.php:88 templates/index.php:89 +msgid "Unshare" +msgstr "" + +#: templates/index.php:94 templates/index.php:95 +msgid "Delete" +msgstr "" + +#: templates/index.php:108 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:110 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:115 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:118 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po new file mode 100644 index 00000000000..3c4beade2a4 --- /dev/null +++ b/l10n/nqo/files_encryption.po @@ -0,0 +1,176 @@ +# 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-09-07 04:39-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: hooks/hooks.php:51 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:52 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "" + +#: hooks/hooks.php:250 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "" + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po new file mode 100644 index 00000000000..bb48f60af6e --- /dev/null +++ b/l10n/nqo/files_external.po @@ -0,0 +1,123 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:453 +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:457 +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 "" + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:12 +msgid "Options" +msgstr "" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:90 +msgid "None set" +msgstr "" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "" + +#: templates/settings.php:100 +msgid "Users" +msgstr "" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po new file mode 100644 index 00000000000..8c548248cff --- /dev/null +++ b/l10n/nqo/files_sharing.po @@ -0,0 +1,80 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:26 templates/public.php:92 +msgid "Download" +msgstr "" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "" + +#: templates/public.php:89 +msgid "No preview available for" +msgstr "" diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po new file mode 100644 index 00000000000..8c737c0b757 --- /dev/null +++ b/l10n/nqo/files_trashbin.po @@ -0,0 +1,82 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:184 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:185 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:193 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/trash.js:199 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "" diff --git a/l10n/nqo/files_versions.po b/l10n/nqo/files_versions.po new file mode 100644 index 00000000000..2ced8c6105d --- /dev/null +++ b/l10n/nqo/files_versions.po @@ -0,0 +1,43 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:7 +msgid "Versions" +msgstr "" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:79 +msgid "More versions..." +msgstr "" + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:145 +msgid "Restore" +msgstr "" diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po new file mode 100644 index 00000000000..0c4a68dff9d --- /dev/null +++ b/l10n/nqo/lib.po @@ -0,0 +1,318 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: app.php:250 +msgid "No app name specified" +msgstr "" + +#: app.php:361 +msgid "Help" +msgstr "" + +#: app.php:374 +msgid "Personal" +msgstr "" + +#: app.php:385 +msgid "Settings" +msgstr "" + +#: app.php:397 +msgid "Users" +msgstr "" + +#: app.php:410 +msgid "Admin" +msgstr "" + +#: app.php:837 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "" + +#: installer.php:123 +msgid "App does not provide an info.xml file" +msgstr "" + +#: installer.php:129 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: installer.php:138 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: installer.php:144 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: installer.php:150 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: installer.php:160 +msgid "App directory already exists" +msgstr "" + +#: installer.php:173 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template/functions.php:96 +msgid "seconds ago" +msgstr "" + +#: template/functions.php:97 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" + +#: template/functions.php:98 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" + +#: template/functions.php:99 +msgid "today" +msgstr "" + +#: template/functions.php:100 +msgid "yesterday" +msgstr "" + +#: template/functions.php:101 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" + +#: template/functions.php:102 +msgid "last month" +msgstr "" + +#: template/functions.php:103 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" + +#: template/functions.php:104 +msgid "last year" +msgstr "" + +#: template/functions.php:105 +msgid "years ago" +msgstr "" + +#: template.php:297 +msgid "Caused by:" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po new file mode 100644 index 00000000000..6c18abbb142 --- /dev/null +++ b/l10n/nqo/settings.po @@ -0,0 +1,540 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "" + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:126 +msgid "Error" +msgstr "" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "" + +#: js/apps.js:130 +msgid "Updated" +msgstr "" + +#: js/personal.js:150 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:172 +msgid "Saving..." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 +msgid "Groups" +msgstr "" + +#: js/users.js:97 templates/users.php:89 templates/users.php:124 +msgid "Group Admin" +msgstr "" + +#: js/users.js:120 templates/users.php:164 +msgid "Delete" +msgstr "" + +#: js/users.js:277 +msgid "add group" +msgstr "" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:40 personal.php:41 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "" + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:92 +msgid "Cron" +msgstr "" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "" + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "" + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:170 +msgid "Security" +msgstr "" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:203 +msgid "Log" +msgstr "" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "" + +#: templates/admin.php:235 +msgid "More" +msgstr "" + +#: templates/admin.php:236 +msgid "Less" +msgstr "" + +#: templates/admin.php:242 templates/personal.php:140 +msgid "Version" +msgstr "" + +#: templates/admin.php:246 templates/personal.php:143 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:86 +msgid "Password" +msgstr "" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:44 +msgid "New password" +msgstr "" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "" + +#: templates/personal.php:58 templates/users.php:85 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:73 +msgid "Email" +msgstr "" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:85 templates/personal.php:86 +msgid "Language" +msgstr "" + +#: templates/personal.php:98 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:104 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:106 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "" + +#: templates/personal.php:117 +msgid "Encryption" +msgstr "" + +#: templates/personal.php:119 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "" + +#: templates/personal.php:125 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:130 +msgid "Decrypt all Files" +msgstr "" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "" + +#: templates/users.php:30 +msgid "Create" +msgstr "" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:48 templates/users.php:142 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:66 templates/users.php:157 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Username" +msgstr "" + +#: templates/users.php:91 +msgid "Storage" +msgstr "" + +#: templates/users.php:102 +msgid "change display name" +msgstr "" + +#: templates/users.php:106 +msgid "set new password" +msgstr "" + +#: templates/users.php:137 +msgid "Default" +msgstr "" diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po new file mode 100644 index 00000000000..d377705d79d --- /dev/null +++ b/l10n/nqo/user_ldap.po @@ -0,0 +1,406 @@ +# 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-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:112 +msgid "Success" +msgstr "" + +#: js/settings.js:117 +msgid "Error" +msgstr "" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:37 +msgid "Host" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "" + +#: templates/settings.php:46 +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:47 +msgid "Password" +msgstr "" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:69 +msgid "Port" +msgstr "" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "" + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "" + +#: templates/settings.php:108 +msgid "Help" +msgstr "" diff --git a/l10n/nqo/user_webdavauth.po b/l10n/nqo/user_webdavauth.po new file mode 100644 index 00000000000..c509260cd3b --- /dev/null +++ b/l10n/nqo/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nqo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "" + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 5b2896c6e35..b8f937e6823 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configuracion" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segonda a" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "uèi" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ièr" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "mes passat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "meses a" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "an passat" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "ans a" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po index 253801f6c9f..f41c123348c 100644 --- a/l10n/oc/files_sharing.po +++ b/l10n/oc/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Avalcarga" @@ -75,6 +75,6 @@ msgstr "Amontcarga" msgid "Cancel upload" msgstr " Anulla l'amontcargar" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index 6a06eef3b99..d004fe066eb 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Pas capable de tira un usancièr del grop %s" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactiva" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activa" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Error" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index b4c7072825e..48c4e281c6d 100644 --- a/l10n/oc/user_ldap.po +++ b/l10n/oc/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 3aeb046dccc..168f599bcab 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-05 10:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:40+0000\n" "Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -408,7 +408,7 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s współdzieli folder z tobą %s" msgid "%s shared the file %s with you" msgstr "%s współdzieli z tobą plik %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Pobierz" @@ -76,6 +76,6 @@ msgstr "Wyślij" msgid "Cancel upload" msgstr "Anuluj wysyłanie" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Podgląd nie jest dostępny dla" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 310e6c15fa6..f6c9b021ae0 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/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: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-05 10:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:40+0000\n" "Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index f2571b2fb2a..fc5af2df213 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:40+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" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index b3280313839..f2fe5bb3097 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "dezembro" msgid "Settings" msgstr "Ajustes" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoje" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ontem" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "último mês" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "meses atrás" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "último ano" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anos atrás" @@ -404,7 +404,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s compartilhou a pasta %s com você" msgid "%s shared the file %s with you" msgstr "%s compartilhou o arquivo %s com você" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Baixar" @@ -76,6 +76,6 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Nenhuma visualização disponível para" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 4214958d1ab..0e491b5b608 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/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: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 12:21+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -86,47 +86,47 @@ msgstr "Não foi possível remover usuário do grupo %s" msgid "Couldn't update app." msgstr "Não foi possível atualizar a app." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atualizar para {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desabilitar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Habilitar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Por favor, aguarde..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Erro enquanto desabilitava o aplicativo" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Erro enquanto habilitava o aplicativo" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Atualizando..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Erro ao atualizar aplicativo" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Erro" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Atualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Atualizado" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index b2edb3b335a..e54db81dd83 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 12:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index ee257663691..9b748ac3e69 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -174,55 +174,55 @@ msgstr "Dezembro" msgid "Settings" msgstr "Configurações" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "Minutos atrás" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoje" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ontem" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "ultímo mês" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "meses atrás" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "ano passado" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anos atrás" @@ -406,7 +406,7 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index 200f818e9f3..ad35a566339 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s partilhou a pasta %s consigo" msgid "%s shared the file %s with you" msgstr "%s partilhou o ficheiro %s consigo" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Transferir" @@ -77,6 +77,6 @@ msgstr "Carregar" msgid "Cancel upload" msgstr "Cancelar envio" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Não há pré-visualização para" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index e2768600954..b844821c4d1 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 14:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 435fb626098..03ef1f30c99 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 6cbf39f5e00..4e3456dff0e 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -174,59 +174,59 @@ msgstr "Decembrie" msgid "Settings" msgstr "Setări" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "secunde în urmă" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "astăzi" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ieri" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "ultima lună" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "luni în urmă" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "ultimul an" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "ani în urmă" @@ -410,7 +410,7 @@ msgstr "Actualizarea a eșuat! Raportați problema către \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s a partajat directorul %s cu tine" msgid "%s shared the file %s with you" msgstr "%s a partajat fișierul %s cu tine" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Descarcă" @@ -76,6 +76,6 @@ msgstr "Încărcare" msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Nici o previzualizare disponibilă pentru " diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 1e816b50f09..cc6ceeae392 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -85,47 +85,47 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s" msgid "Couldn't update app." msgstr "Aplicaţia nu s-a putut actualiza." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizat la {versiuneaaplicaţiei}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Dezactivați" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activare" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Aşteptaţi vă rog...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Actualizare în curs...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Eroare în timpul actualizării aplicaţiei" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Eroare" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizare" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizat" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index db4843a8a90..e97322cda88 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 7721c948b2e..d4f0601de09 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -178,59 +178,59 @@ msgstr "Декабрь" msgid "Settings" msgstr "Конфигурация" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "несколько секунд назад" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n минуту назад" msgstr[1] "%n минуты назад" msgstr[2] "%n минут назад" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n час назад" msgstr[1] "%n часа назад" msgstr[2] "%n часов назад" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "сегодня" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "вчера" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n день назад" msgstr[1] "%n дня назад" msgstr[2] "%n дней назад" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "в прошлом месяце" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n месяц назад" msgstr[1] "%n месяца назад" msgstr[2] "%n месяцев назад" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "несколько месяцев назад" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "в прошлом году" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "несколько лет назад" @@ -414,7 +414,7 @@ msgstr "При обновлении произошла ошибка. Пожал msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "%s сброс пароля" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index 5553e3a10ad..4692762ac92 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Den4md \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s открыл доступ к папке %s для Вас" msgid "%s shared the file %s with you" msgstr "%s открыл доступ к файлу %s для Вас" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Скачать" @@ -77,6 +77,6 @@ msgstr "Загрузка" msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Предпросмотр недоступен для" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 2777eaad80f..1f199e7b788 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 07:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Aleksey Grigoryev \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -91,47 +91,47 @@ msgstr "Невозможно удалить пользователя из гру msgid "Couldn't update app." msgstr "Невозможно обновить приложение" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Обновить до {версия приложения}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Выключить" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Включить" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Подождите..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Обновление..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Ошибка при обновлении приложения" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Ошибка" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Обновить" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Обновлено" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index f47972aa0b7..b231595c2f9 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 87d7c2b49e7..4dd2f29f84c 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "දෙසැම්බර්" msgid "Settings" msgstr "සිටුවම්" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "තත්පරයන්ට පෙර" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "අද" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ඊයේ" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "පෙර මාසයේ" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "මාස කීපයකට පෙර" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "පෙර අවුරුද්දේ" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "අවුරුදු කීපයකට පෙර" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po index b281c905bc2..d64ece397ac 100644 --- a/l10n/si_LK/files_sharing.po +++ b/l10n/si_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත් msgid "%s shared the file %s with you" msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "බාන්න" @@ -75,6 +75,6 @@ msgstr "උඩුගත කරන්න" msgid "Cancel upload" msgstr "උඩුගත කිරීම අත් හරින්න" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "පූර්වදර්ශනයක් නොමැත" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 0aaa56ad95d..eb89035ca94 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "අක්‍රිය කරන්න" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "සක්‍රිය කරන්න" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "දෝෂයක්" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "යාවත්කාල කිරීම" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index d45dc541340..9628a98779c 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index d1688333716..70e16033524 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,59 +172,59 @@ msgstr "December" msgid "Settings" msgstr "Nastavenia" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "pred sekundami" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minútou" msgstr[1] "pred %n minútami" msgstr[2] "pred %n minútami" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n hodinou" msgstr[1] "pred %n hodinami" msgstr[2] "pred %n hodinami" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "dnes" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "včera" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "pred %n dňom" msgstr[1] "pred %n dňami" msgstr[2] "pred %n dňami" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "minulý mesiac" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesiacom" msgstr[1] "pred %n mesiacmi" msgstr[2] "pred %n mesiacmi" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "pred mesiacmi" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "minulý rok" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "pred rokmi" @@ -408,7 +408,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s zdieľa s vami priečinok %s" msgid "%s shared the file %s with you" msgstr "%s zdieľa s vami súbor %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Sťahovanie" @@ -76,6 +76,6 @@ msgstr "Odoslať" msgid "Cancel upload" msgstr "Zrušiť odosielanie" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Žiaden náhľad k dispozícii pre" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 809ca007cb6..b2bca71bb2e 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/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: 2013-08-30 09:33-0400\n" -"PO-Revision-Date: 2013-08-28 18:11+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index df53e53b608..4c4d7f82839 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-28 18:21+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: martin\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 73fa71d789d..c110bdd23b0 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,11 +172,11 @@ msgstr "december" msgid "Settings" msgstr "Nastavitve" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -184,7 +184,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -192,15 +192,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "danes" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "včeraj" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -208,11 +208,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "zadnji mesec" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -220,15 +220,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mesecev nazaj" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "lansko leto" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "let nazaj" @@ -412,7 +412,7 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Oseba %s je določila mapo %s za souporabo" msgid "%s shared the file %s with you" msgstr "Oseba %s je določila datoteko %s za souporabo" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Prejmi" @@ -75,6 +75,6 @@ msgstr "Pošlji" msgid "Cancel upload" msgstr "Prekliči pošiljanje" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Predogled ni na voljo za" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 2ffd3e80111..79967879aab 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -86,47 +86,47 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s" msgid "Couldn't update app." msgstr "Programa ni mogoče posodobiti." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Posodobi na {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Onemogoči" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Omogoči" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Počakajte ..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Poteka posodabljanje ..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Prišlo je do napake med posodabljanjem programa." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Napaka" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Posodobi" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Posodobljeno" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index cc6fa550f76..4a826a92f8c 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 5b7abe91daa..165384e9f00 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/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: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -172,55 +172,55 @@ msgstr "Dhjetor" msgid "Settings" msgstr "Parametra" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekonda më parë" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "sot" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "dje" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "muajin e shkuar" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "muaj më parë" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "vitin e shkuar" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "vite më parë" @@ -404,7 +404,7 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s ndau me ju dosjen %s" msgid "%s shared the file %s with you" msgstr "%s ndau me ju skedarin %s" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Shkarko" @@ -75,6 +75,6 @@ msgstr "Ngarko" msgid "Cancel upload" msgstr "Anulo ngarkimin" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Shikimi paraprak nuk është i mundur për" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 9e65797efea..2e15e7dd55c 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Veprim i gabuar" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Azhurno" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index f8f129da269..89615eb99c3 100644 --- a/l10n/sq/user_ldap.po +++ b/l10n/sq/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 3a92c457140..9df2f05ad78 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,59 +170,59 @@ msgstr "Децембар" msgid "Settings" msgstr "Поставке" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "пре неколико секунди" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "данас" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "јуче" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "прошлог месеца" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "месеци раније" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "прошле године" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "година раније" @@ -406,7 +406,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po index 0b670840b60..1e1a3f4e98f 100644 --- a/l10n/sr/files_sharing.po +++ b/l10n/sr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Преузми" @@ -75,6 +75,6 @@ msgstr "Отпреми" msgid "Cancel upload" msgstr "Прекини отпремање" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index 1bbe0a101e5..81328359c1d 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Не могу да уклоним корисника из групе %s" msgid "Couldn't update app." msgstr "Не могу да ажурирам апликацију." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Ажурирај на {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Искључи" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Омогући" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Сачекајте…" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Ажурирам…" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Грешка при ажурирању апликације" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Грешка" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Ажурирај" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Ажурирано" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index a563a3a7ca5..57813276079 100644 --- a/l10n/sr/user_ldap.po +++ b/l10n/sr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index d4e845dc023..3b94853a958 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,59 +170,59 @@ msgstr "Decembar" msgid "Settings" msgstr "Podešavanja" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po index 370cbd5e775..00ac03d66b5 100644 --- a/l10n/sr@latin/files_sharing.po +++ b/l10n/sr@latin/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Preuzmi" @@ -75,6 +75,6 @@ msgstr "Pošalji" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index cdf4509a43e..8e5d2b4c2ea 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index 883e7aae577..cdb427f5c8c 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 04d23af90d9..989c71a1344 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -174,55 +174,55 @@ msgstr "December" msgid "Settings" msgstr "Inställningar" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekunder sedan" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut sedan" msgstr[1] "%n minuter sedan" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n timme sedan" msgstr[1] "%n timmar sedan" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "i dag" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "i går" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sedan" msgstr[1] "%n dagar sedan" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "förra månaden" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sedan" msgstr[1] "%n månader sedan" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "månader sedan" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "förra året" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "år sedan" @@ -406,7 +406,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "%s delade mappen %s med dig" msgid "%s shared the file %s with you" msgstr "%s delade filen %s med dig" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Ladda ner" @@ -77,6 +77,6 @@ msgstr "Ladda upp" msgid "Cancel upload" msgstr "Avbryt uppladdning" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Ingen förhandsgranskning tillgänglig för" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index d2f92282933..431588e31f5 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-28 10:20+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -90,47 +90,47 @@ msgstr "Kan inte radera användare från gruppen %s" msgid "Couldn't update app." msgstr "Kunde inte uppdatera appen." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Uppdatera till {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Deaktivera" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Aktivera" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Var god vänta..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Fel vid inaktivering av app" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Fel vid aktivering av app" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Uppdaterar..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Fel uppstod vid uppdatering av appen" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Fel" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Uppdatera" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Uppdaterad" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index fe62bebfde0..48d8dddb418 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-28 11:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index c04debca141..e2ce13ab230 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,55 +170,55 @@ msgstr "மார்கழி" msgid "Settings" msgstr "அமைப்புகள்" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "செக்கன்களுக்கு முன்" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "இன்று" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "நேற்று" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "கடந்த மாதம்" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "மாதங்களுக்கு முன்" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "கடந்த வருடம்" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "வருடங்களுக்கு முன்" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po index 6f439f6a08f..b38e26a728c 100644 --- a/l10n/ta_LK/files_sharing.po +++ b/l10n/ta_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s கோப்புறையானது %s உடன் பகிர msgid "%s shared the file %s with you" msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "பதிவிறக்குக" @@ -75,6 +75,6 @@ msgstr "பதிவேற்றுக" msgid "Cancel upload" msgstr "பதிவேற்றலை இரத்து செய்க" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index 6397e7f2b9f..9105b4a6950 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "இயலுமைப்ப" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "இயலுமைப்படுத்துக" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "வழு" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "இற்றைப்படுத்தல்" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index 971037c4056..3df1b0da627 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/te/core.po b/l10n/te/core.po index 2101fe896a7..83006f1923c 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -170,55 +170,55 @@ msgstr "డిసెంబర్" msgid "Settings" msgstr "అమరికలు" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "క్షణాల క్రితం" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "ఈరోజు" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "నిన్న" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "పోయిన నెల" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "నెలల క్రితం" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "పోయిన సంవత్సరం" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "సంవత్సరాల క్రితం" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po index ed863a3da31..3e0c6d01743 100644 --- a/l10n/te/files_sharing.po +++ b/l10n/te/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-04 01:55-0400\n" -"PO-Revision-Date: 2013-08-04 05:02+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index 13caf52b176..20049af7717 100644 --- a/l10n/te/settings.po +++ b/l10n/te/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "పొరపాటు" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po index ae1d36e9c59..f187c04b451 100644 --- a/l10n/te/user_ldap.po +++ b/l10n/te/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 0405b8cabf8..881ab169c53 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -403,7 +403,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index edc1434fe7c..2dc90503da2 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:39-0400\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 8ad9f8fe117..eda0d06b9bc 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:39-0400\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 551a91905d7..cda5e4e946a 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 fe5a83d1b43..caa643da051 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 784a56543d3..40408f711cf 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 b737c6b8590..4f1f809a1fa 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 ce7cf69cfd4..1d58f4f7edc 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 f6c3ec932b4..bd3a4ca3662 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 ab5d56dc2fd..8229647d04b 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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 7010282b015..e9198de58de 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\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/core.po b/l10n/th_TH/core.po index 44071aa2ac3..06fd3424780 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,51 +170,51 @@ msgstr "ธันวาคม" msgid "Settings" msgstr "ตั้งค่า" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "วินาที ก่อนหน้านี้" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "วันนี้" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "เมื่อวานนี้" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "เดือนที่แล้ว" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "เดือน ที่ผ่านมา" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "ปีที่แล้ว" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "ปี ที่ผ่านมา" @@ -398,7 +398,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ msgid "The update was successful. Redirecting you to ownCloud now." msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po index ba9c49aba20..b9a165c4814 100644 --- a/l10n/th_TH/files_sharing.po +++ b/l10n/th_TH/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับ msgid "%s shared the file %s with you" msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "ดาวน์โหลด" @@ -75,6 +75,6 @@ msgstr "อัพโหลด" msgid "Cancel upload" msgstr "ยกเลิกการอัพโหลด" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index e08c6a264a2..81a63f742cb 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ msgid "Couldn't update app." msgstr "ไม่สามารถอัพเดทแอปฯ" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "อัพเดทไปเป็นรุ่น {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "ปิดใช้งาน" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "เปิดใช้งาน" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "กรุณารอสักครู่..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "กำลังอัพเดทข้อมูล..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "ข้อผิดพลาด" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "อัพเดท" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "อัพเดทแล้ว" diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po index d1f63c56b87..f1de28b8322 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index c16793359c9..e8dbd20a138 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-04 11:02+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: Fatih Aşıcı \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -405,7 +405,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s sizinle paylaşılan %s klasör" msgid "%s shared the file %s with you" msgstr "%s sizinle paylaşılan %s klasör" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "İndir" @@ -75,6 +75,6 @@ msgstr "Yükle" msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Kullanılabilir önizleme yok" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index ae9145f2120..ecad53e30f6 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-27 00:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -88,47 +88,47 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor" msgid "Couldn't update app." msgstr "Uygulama güncellenemedi." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} Güncelle" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Etkin değil" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Etkinleştir" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Lütfen bekleyin...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "Uygulama devre dışı bırakılırken hata" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "Uygulama etkinleştirilirken hata" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Güncelleniyor...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Uygulama güncellenirken hata" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Hata" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Güncelleme" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Güncellendi" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index b9254262c51..69f083c6084 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 307adf55903..a5cfb82e292 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -170,51 +170,51 @@ msgstr "كۆنەك" msgid "Settings" msgstr "تەڭشەكلەر" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "بۈگۈن" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "تۈنۈگۈن" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -398,7 +398,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po index cf512bccd19..7f92bdfcdd4 100644 --- a/l10n/ug/files_sharing.po +++ b/l10n/ug/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "چۈشۈر" @@ -76,6 +76,6 @@ msgstr "يۈكلە" msgid "Cancel upload" msgstr "يۈكلەشتىن ۋاز كەچ" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index c1174f80736..17d00d8a616 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 17:30+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -85,47 +85,47 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل msgid "Couldn't update app." msgstr "ئەپنى يېڭىلىيالمايدۇ." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} غا يېڭىلايدۇ" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "چەكلە" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "قوزغات" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "سەل كۈتۈڭ…" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "يېڭىلاۋاتىدۇ…" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "خاتالىق" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "يېڭىلا" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "يېڭىلاندى" diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po index fa2c51ddd26..ad88262b440 100644 --- a/l10n/ug/user_ldap.po +++ b/l10n/ug/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 9467404002f..dd3139936c7 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -170,59 +170,59 @@ msgstr "Грудень" msgid "Settings" msgstr "Налаштування" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "секунди тому" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "сьогодні" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "вчора" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "минулого місяця" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "місяці тому" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "минулого року" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "роки тому" @@ -406,7 +406,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud." -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index 884b5932450..668895e8dc0 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "%s опублікував каталог %s для Вас" msgid "%s shared the file %s with you" msgstr "%s опублікував файл %s для Вас" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Завантажити" @@ -75,6 +75,6 @@ msgstr "Вивантажити" msgid "Cancel upload" msgstr "Перервати завантаження" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Попередній перегляд недоступний для" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 8aaa83fd2a5..260151bbc5a 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Не вдалося видалити користувача із гру msgid "Couldn't update app." msgstr "Не вдалося оновити програму. " -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Оновити до {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Вимкнути" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Включити" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Зачекайте, будь ласка..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Оновлюється..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Помилка при оновленні програми" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Помилка" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Оновити" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Оновлено" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index 9f05e0918b7..db0bfc141d0 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 4e063c00681..3be723e180c 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -170,55 +170,55 @@ msgstr "دسمبر" msgid "Settings" msgstr "سیٹینگز" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po index 6880222c4ce..0d12edb3665 100644 --- a/l10n/ur_PK/files_sharing.po +++ b/l10n/ur_PK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-04 01:55-0400\n" -"PO-Revision-Date: 2013-08-04 05:02+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "" @@ -75,6 +75,6 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 256bc2a51e7..c323e0f3699 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "ایرر" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po index 085620de421..fd54d8167be 100644 --- a/l10n/ur_PK/user_ldap.po +++ b/l10n/ur_PK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index dda5098f3cb..6f1a476bb4d 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -171,51 +171,51 @@ msgstr "Tháng 12" msgid "Settings" msgstr "Cài đặt" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "vài giây trước" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hôm nay" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "hôm qua" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "tháng trước" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "tháng trước" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "năm trước" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "năm trước" @@ -399,7 +399,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "%s đã chia sẻ thư mục %s với bạn" msgid "%s shared the file %s with you" msgstr "%s đã chia sẻ tập tin %s với bạn" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Tải về" @@ -75,6 +75,6 @@ msgstr "Tải lên" msgid "Cancel upload" msgstr "Hủy upload" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Không có xem trước cho" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 13a831ade8c..221e49254c4 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "Không thể xóa người dùng từ nhóm %s" msgid "Couldn't update app." msgstr "Không thể cập nhật ứng dụng" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Cập nhật lên {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Tắt" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Bật" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Xin hãy đợi..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Đang cập nhật..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Lỗi khi cập nhật ứng dụng" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Lỗi" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Cập nhật" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Đã cập nhật" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index 350cf0c3a2d..e926fbc3d81 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 450b3755876..a533a1d73ee 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -173,51 +173,51 @@ msgstr "十二月" msgid "Settings" msgstr "设置" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "秒前" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分钟前" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小时前" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "今天" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "昨天" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "上月" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 月前" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "月前" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "去年" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "年前" @@ -401,7 +401,7 @@ msgstr "更新不成功。请汇报将此问题汇报给 \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "%s与您共享了%s文件夹" msgid "%s shared the file %s with you" msgstr "%s与您共享了%s文件" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "下载" @@ -76,6 +76,6 @@ msgstr "上传" msgid "Cancel upload" msgstr "取消上传" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "没有预览" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index d8d9cefc362..26bf0b96692 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/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: 2013-08-28 06:22-0400\n" -"PO-Revision-Date: 2013-08-27 17:40+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: Xuetian Weng \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -89,47 +89,47 @@ msgstr "无法从组%s中移除用户" msgid "Couldn't update app." msgstr "无法更新 app。" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "更新至 {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "禁用" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "开启" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "请稍等...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "禁用 app 时出错" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "启用 app 时出错" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "正在更新...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "更新 app 时出错" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "错误" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "更新" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "已更新" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index f1052643431..22c5379e558 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 13d575a3d0c..bf509c72dd3 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+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" @@ -170,51 +170,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "今日" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "昨日" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "前一月" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "個月之前" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" @@ -398,7 +398,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "更新成功, 正" -#: lostpassword/controller.php:61 +#: lostpassword/controller.php:62 #, php-format msgid "%s password reset" msgstr "" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index 1ab84440f23..f48a313ec7d 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -63,7 +63,7 @@ msgstr "" msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "下載" @@ -75,6 +75,6 @@ msgstr "上傳" msgid "Cancel upload" msgstr "" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 3d0d5b13265..a6337dac805 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: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" @@ -84,47 +84,47 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" msgstr "" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" msgstr "" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "錯誤" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index 98bb4324137..ecd9fd8d4c1 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+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" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 2a689d6fc8f..19b6f0e5377 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 13:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:50+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -172,51 +172,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "幾秒前" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分鐘前" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小時前" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "今天" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "昨天" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "上個月" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 個月前" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "幾個月前" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "去年" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "幾年前" @@ -400,7 +400,7 @@ msgstr "升級失敗，請將此問題回報 \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 5bda63d03bd..3084cdbc88e 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/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: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 14:00+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index fd00e191fde..50beca64ee5 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 06:10+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/lib/l10n/ach.php b/lib/l10n/ach.php new file mode 100644 index 00000000000..406ff5f5a26 --- /dev/null +++ b/lib/l10n/ach.php @@ -0,0 +1,8 @@ + array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/es.php b/lib/l10n/es.php index bd13106237a..047d5d955bb 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -35,7 +35,7 @@ $TRANSLATIONS = array( "Images" => "Imágenes", "%s enter the database username." => "%s ingresar el usuario de la base de datos.", "%s enter the database name." => "%s ingresar el nombre de la base de datos", -"%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos", +"%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos", "MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s", "You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.", "MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos", diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php new file mode 100644 index 00000000000..15f78e0bce6 --- /dev/null +++ b/lib/l10n/es_MX.php @@ -0,0 +1,8 @@ + array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php index e2b67e76187..2d37001ca19 100644 --- a/lib/l10n/ja_JP.php +++ b/lib/l10n/ja_JP.php @@ -23,6 +23,7 @@ $TRANSLATIONS = array( "App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません", "App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません", "App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "非shippedアプリには許可されないtrueタグが含まれているためにアプリをインストール出来ません。", "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません", "App directory already exists" => "アプリディレクトリは既に存在します", "Can't create app folder. Please fix permissions. %s" => "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。", diff --git a/lib/l10n/nqo.php b/lib/l10n/nqo.php new file mode 100644 index 00000000000..e7b09649a24 --- /dev/null +++ b/lib/l10n/nqo.php @@ -0,0 +1,8 @@ + array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index f4f50e5949a..252692ea4c3 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Por favor, esperá....", +"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación", +"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación", "Updating...." => "Actualizando....", "Error while updating app" => "Error al actualizar App", "Error" => "Error", "Update" => "Actualizar", "Updated" => "Actualizado", +"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.", "Saving..." => "Guardando...", "deleted" => "borrado", "undo" => "deshacer", @@ -38,14 +41,20 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Debe ingresar una contraseña válida", "__language_name__" => "Castellano (Argentina)", "Security Warning" => "Advertencia de seguridad", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.", "Setup Warning" => "Alerta de Configuración", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.", +"Please double check the installation guides." => "Por favor, cheque bien la guía de instalación.", "Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type", "Locale not working" => "\"Locale\" no está funcionando", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s.", "Internet connection not working" => "La conexión a Internet no esta funcionando. ", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.", "Cron" => "Cron", "Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http.", +"Use systems cron service to call the cron.php file once a minute." => "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto.", "Sharing" => "Compartiendo", "Enable Share API" => "Habilitar Share API", "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API", @@ -59,6 +68,8 @@ $TRANSLATIONS = array( "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos", "Security" => "Seguridad", "Enforce HTTPS" => "Forzar HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL", "Log" => "Log", "Log level" => "Nivel de Log", "More" => "Más", @@ -94,6 +105,9 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Usá esta dirección para acceder a tus archivos a través de WebDAV", "Encryption" => "Encriptación", +"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos", +"Log-in password" => "Clave de acceso", +"Decrypt all Files" => "Desencriptar todos los archivos", "Login Name" => "Nombre de Usuario", "Create" => "Crear", "Admin Recovery Password" => "Recuperación de contraseña de administrador", -- cgit v1.2.3 From 46a57a9f05eea77889ea33082b5c2259d89acc7a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 7 Sep 2013 14:10:51 +0200 Subject: change View->deleteAll to an alias of View->rmdir since rmdir works recursive --- lib/files/view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/view.php b/lib/files/view.php index 406354e2336..98a04486690 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -333,7 +333,7 @@ class View { } public function deleteAll($directory, $empty = false) { - return $this->basicOperation('deleteAll', $directory, array('delete'), $empty); + return $this->rmdir($directory); } public function rename($path1, $path2) { -- cgit v1.2.3 From 92f6c3bb10b698c9c1ffb13b7c142a936fb94705 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 8 Sep 2013 21:37:53 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/uk.php | 1 + apps/files_encryption/l10n/nn_NO.php | 3 +- apps/files_trashbin/l10n/nn_NO.php | 5 ++-- core/l10n/nn_NO.php | 24 +++++++++++++--- l10n/nn_NO/core.po | 55 ++++++++++++++++++------------------ l10n/nn_NO/files_encryption.po | 12 ++++---- l10n/nn_NO/files_trashbin.po | 13 +++++---- l10n/nn_NO/lib.po | 37 ++++++++++++------------ l10n/nn_NO/settings.po | 47 +++++++++++++++--------------- 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_trashbin.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/uk/files.po | 8 +++--- lib/l10n/nn_NO.php | 10 +++---- settings/l10n/nn_NO.php | 20 +++++++++++++ 23 files changed, 150 insertions(+), 107 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 781590cff35..bea1d930799 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує", "Could not move %s" => "Не вдалося перемістити %s", +"Unable to set upload directory." => "Не вдалося встановити каталог завантаження.", "No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка", "There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ", diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php index b99d0751540..bb30d69c592 100644 --- a/apps/files_encryption/l10n/nn_NO.php +++ b/apps/files_encryption/l10n/nn_NO.php @@ -1,5 +1,6 @@ "Lagrar …" +"Saving..." => "Lagrar …", +"Encryption" => "Kryptering" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php index 078adbc0e26..73fe48211c2 100644 --- a/apps/files_trashbin/l10n/nn_NO.php +++ b/apps/files_trashbin/l10n/nn_NO.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Slett for godt", "Name" => "Namn", "Deleted" => "Sletta", -"_%n folder_::_%n folders_" => array("","%n mapper"), -"_%n file_::_%n files_" => array("","%n filer"), +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), +"restored" => "gjenoppretta", "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!", "Restore" => "Gjenopprett", "Delete" => "Slett", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 942824ecb74..6d34d6e23c3 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -1,6 +1,13 @@ "%s delte «%s» med deg", "group" => "gruppe", +"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus", +"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus", +"Updated database" => "Database oppdatert", +"Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …", +"Updated filecache" => "Mellomlager oppdatert", +"... %d%% done ..." => "… %d %% ferdig …", "Category type not provided." => "Ingen kategoritype.", "No category to add?" => "Ingen kategori å leggja til?", "This category already exists: %s" => "Denne kategorien finst alt: %s", @@ -30,17 +37,18 @@ $TRANSLATIONS = array( "December" => "Desember", "Settings" => "Innstillingar", "seconds ago" => "sekund sidan", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minutt sidan","%n minutt sidan"), +"_%n hour ago_::_%n hours ago_" => array("%n time sidan","%n timar sidan"), "today" => "i dag", "yesterday" => "i går", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("%n dag sidan","%n dagar sidan"), "last month" => "førre månad", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"), "months ago" => "månadar sidan", "last year" => "i fjor", "years ago" => "år sidan", "Choose" => "Vel", +"Error loading file picker template" => "Klarte ikkje å lasta filveljarmalen", "Yes" => "Ja", "No" => "Nei", "Ok" => "Greitt", @@ -59,6 +67,7 @@ $TRANSLATIONS = array( "Share with link" => "Del med lenkje", "Password protect" => "Passordvern", "Password" => "Passord", +"Allow Public Upload" => "Tillat offentleg opplasting", "Email link to person" => "Send lenkja over e-post", "Send" => "Send", "Set expiration date" => "Set utløpsdato", @@ -81,11 +90,14 @@ $TRANSLATIONS = array( "Email sent" => "E-post sendt", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Oppdateringa feila. Ver venleg og rapporter feilen til ownCloud-fellesskapet.", "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", +"%s password reset" => "%s passordnullstilling", "Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.
      Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.
      Spør din lokale administrator viss han ikkje er der heller.", "Request failed!
      Did you make sure your email/username was right?" => "Førespurnaden feila!
      Er du viss på at du skreiv inn rett e-post/brukarnamn?", "You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.", "Username" => "Brukarnamn", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?", +"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no", "Request reset" => "Be om nullstilling", "Your password was reset" => "Passordet ditt er nullstilt", "To login page" => "Til innloggingssida", @@ -98,13 +110,16 @@ $TRANSLATIONS = array( "Help" => "Hjelp", "Access forbidden" => "Tilgang forbudt", "Cloud not found" => "Fann ikkje skyen", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!", "Edit categories" => "Endra kategoriar", "Add" => "Legg til", "Security Warning" => "Tryggleiksåtvaring", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.", +"For information how to properly configure your server, please see the documentation." => "Ver venleg og les dokumentasjonen for meir informasjon om korleis du konfigurerer tenaren din.", "Create an admin account" => "Lag ein admin-konto", "Advanced" => "Avansert", "Data folder" => "Datamappe", @@ -125,6 +140,7 @@ $TRANSLATIONS = array( "remember" => "hugs", "Log in" => "Logg inn", "Alternative Logins" => "Alternative innloggingar", +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "Hei der,

      nemner berre at %s delte «%s» med deg.
      Sjå det!

      Me talast!<", "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 493954e8077..61b157dad1d 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -5,13 +5,14 @@ # Translators: # unhammer , 2013 # unhammer , 2013 +# unhammer , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 16:30+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "%s shared »%s« with you" -msgstr "" +msgstr "%s delte «%s» med deg" #: ajax/share.php:227 msgid "group" @@ -30,28 +31,28 @@ msgstr "gruppe" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Skrudde på vedlikehaldsmodus" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Skrudde av vedlikehaldsmodus" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Database oppdatert" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Oppdaterer mellomlager; dette kan ta ei god stund …" #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Mellomlager oppdatert" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "… %d %% ferdig …" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -179,14 +180,14 @@ msgstr "sekund sidan" #: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n minutt sidan" +msgstr[1] "%n minutt sidan" #: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n time sidan" +msgstr[1] "%n timar sidan" #: js/js.js:824 msgid "today" @@ -199,8 +200,8 @@ msgstr "i går" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dag sidan" +msgstr[1] "%n dagar sidan" #: js/js.js:827 msgid "last month" @@ -209,8 +210,8 @@ msgstr "førre månad" #: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n månad sidan" +msgstr[1] "%n månadar sidan" #: js/js.js:829 msgid "months ago" @@ -230,7 +231,7 @@ msgstr "Vel" #: js/oc-dialogs.js:143 js/oc-dialogs.js:210 msgid "Error loading file picker template" -msgstr "" +msgstr "Klarte ikkje å lasta filveljarmalen" #: js/oc-dialogs.js:168 msgid "Yes" @@ -311,7 +312,7 @@ msgstr "Passord" #: js/share.js:198 msgid "Allow Public Upload" -msgstr "" +msgstr "Tillat offentleg opplasting" #: js/share.js:202 msgid "Email link to person" @@ -407,7 +408,7 @@ msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no." #: lostpassword/controller.php:62 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s passordnullstilling" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -439,11 +440,11 @@ msgid "" "will be no way to get your data back after your password is reset. If you " "are not sure what to do, please contact your administrator before you " "continue. Do you really want to continue?" -msgstr "" +msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?" #: lostpassword/templates/lostpassword.php:24 msgid "Yes, I really want to reset my password now" -msgstr "" +msgstr "Ja, eg vil nullstilla passordet mitt no" #: lostpassword/templates/lostpassword.php:27 msgid "Request reset" @@ -502,7 +503,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "" +msgstr "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -524,7 +525,7 @@ msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)" #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt." #: templates/installation.php:32 msgid "" @@ -549,7 +550,7 @@ msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett s msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Ver venleg og les dokumentasjonen for meir informasjon om korleis du konfigurerer tenaren din." #: templates/installation.php:47 msgid "Create an admin account" @@ -641,7 +642,7 @@ msgstr "Alternative innloggingar" msgid "" "Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" -msgstr "" +msgstr "Hei der,

      nemner berre at %s delte «%s» med deg.
      Sjå det!

      Me talast!<" #: templates/update.php:3 #, php-format diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po index f1295711ff8..112217447c8 100644 --- a/l10n/nn_NO/files_encryption.po +++ b/l10n/nn_NO/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-09 07:59-0400\n" -"PO-Revision-Date: 2013-08-09 11:59+0000\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 17:40+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" @@ -61,18 +61,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:44 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:45 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:263 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" msgstr "" @@ -96,7 +96,7 @@ msgstr "" #: templates/settings-admin.php:5 templates/settings-personal.php:4 msgid "Encryption" -msgstr "" +msgstr "Kryptering" #: templates/settings-admin.php:10 msgid "" diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po index 93f0ba9fd63..8a6b4412c28 100644 --- a/l10n/nn_NO/files_trashbin.po +++ b/l10n/nn_NO/files_trashbin.po @@ -4,13 +4,14 @@ # # Translators: # unhammer , 2013 +# unhammer , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-06 10:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 15:20+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,18 +56,18 @@ msgstr "Sletta" #: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" +msgstr[0] "%n mappe" msgstr[1] "%n mapper" #: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" +msgstr[0] "%n fil" msgstr[1] "%n filer" #: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "gjenoppretta" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po index 5829746af29..51874c50a46 100644 --- a/l10n/nn_NO/lib.po +++ b/l10n/nn_NO/lib.po @@ -4,13 +4,14 @@ # # Translators: # unhammer , 2013 +# unhammer , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 16:30+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,53 +264,53 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s #: setup.php:185 #, php-format msgid "Please double check the installation guides." -msgstr "Ver vennleg og dobbeltsjekk installasjonsrettleiinga." +msgstr "Ver venleg og dobbeltsjekk installasjonsrettleiinga." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "sekund sidan" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n minutt sidan" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n timar sidan" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "i dag" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "i går" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n dagar sidan" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "førre månad" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n månadar sidan" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "i fjor" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "år sidan" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 7c7314687bb..ff853775225 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -5,13 +5,14 @@ # Translators: # unhammer , 2013 # unhammer , 2013 +# unhammer , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 17:40+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,11 +105,11 @@ msgstr "Ver venleg og vent …" #: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Klarte ikkje å skru av programmet" #: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Klarte ikkje å skru på programmet" #: js/apps.js:123 msgid "Updating...." @@ -132,7 +133,7 @@ msgstr "Oppdatert" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund." #: js/personal.js:172 msgid "Saving..." @@ -194,7 +195,7 @@ msgid "" "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 "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren." #: templates/admin.php:29 msgid "Setup Warning" @@ -209,7 +210,7 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Ver venleg og dobbeltsjekk installasjonsrettleiinga." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -231,7 +232,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -244,7 +245,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane." #: templates/admin.php:92 msgid "Cron" @@ -258,11 +259,11 @@ msgstr "Utfør éi oppgåve for kvar sidelasting" msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet." #: templates/admin.php:120 msgid "Sharing" @@ -286,12 +287,12 @@ msgstr "La brukarar dela ting offentleg med lenkjer" #: templates/admin.php:143 msgid "Allow public uploads" -msgstr "" +msgstr "Tillat offentlege opplastingar" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper" #: templates/admin.php:152 msgid "Allow resharing" @@ -320,14 +321,14 @@ msgstr "Krev HTTPS" #: templates/admin.php:185 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "" +msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling." #: templates/admin.php:191 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)." #: templates/admin.php:203 msgid "Log" @@ -473,23 +474,23 @@ msgstr "WebDAV" msgid "" "Use this address to access your Files via WebDAV" -msgstr "" +msgstr "Bruk denne adressa for å henta filene dine over WebDAV" #: templates/personal.php:117 msgid "Encryption" -msgstr "" +msgstr "Kryptering" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Innloggingspassord" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Dekrypter alle filene" #: templates/users.php:21 msgid "Login Name" @@ -501,13 +502,13 @@ msgstr "Lag" #: templates/users.php:36 msgid "Admin Recovery Password" -msgstr "" +msgstr "Gjenopprettingspassord for administrator" #: templates/users.php:37 templates/users.php:38 msgid "" "Enter the recovery password in order to recover the users files during " "password change" -msgstr "" +msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring" #: templates/users.php:42 msgid "Default Storage" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 881ab169c53..94510245f01 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 2dc90503da2..d62094f9cf6 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 eda0d06b9bc..1c7870c896f 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 cda5e4e946a..19b9e18a9ba 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 caa643da051..69ca7c42eb1 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 40408f711cf..fc02293be45 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 4f1f809a1fa..39cecad8d86 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 1d58f4f7edc..85091b1012d 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 bd3a4ca3662..8ace2ff3749 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 8229647d04b..9f91cb4008c 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\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 e9198de58de..b5aea8713d6 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index cd61a53093e..497990ded39 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"PO-Revision-Date: 2013-09-08 12:50+0000\n" +"Last-Translator: zubr139 \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" @@ -30,7 +30,7 @@ msgstr "Не вдалося перемістити %s" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "Не вдалося встановити каталог завантаження." #: ajax/upload.php:22 msgid "Invalid Token" diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php index 28b4f7b7d94..d5da8c64415 100644 --- a/lib/l10n/nn_NO.php +++ b/lib/l10n/nn_NO.php @@ -10,15 +10,15 @@ $TRANSLATIONS = array( "Files" => "Filer", "Text" => "Tekst", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.", -"Please double check the installation guides." => "Ver vennleg og dobbeltsjekk installasjonsrettleiinga.", +"Please double check the installation guides." => "Ver venleg og dobbeltsjekk installasjonsrettleiinga.", "seconds ago" => "sekund sidan", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","%n minutt sidan"), +"_%n hour ago_::_%n hours ago_" => array("","%n timar sidan"), "today" => "i dag", "yesterday" => "i går", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","%n dagar sidan"), "last month" => "førre månad", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","%n månadar sidan"), "last year" => "i fjor", "years ago" => "år sidan" ); diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php index 438e21d5bcf..822a17e7831 100644 --- a/settings/l10n/nn_NO.php +++ b/settings/l10n/nn_NO.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Slå av", "Enable" => "Slå på", "Please wait...." => "Ver venleg og vent …", +"Error while disabling app" => "Klarte ikkje å skru av programmet", +"Error while enabling app" => "Klarte ikkje å skru på programmet", "Updating...." => "Oppdaterer …", "Error while updating app" => "Feil ved oppdatering av app", "Error" => "Feil", "Update" => "Oppdater", "Updated" => "Oppdatert", +"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.", "Saving..." => "Lagrar …", "deleted" => "sletta", "undo" => "angra", @@ -38,25 +41,35 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Du må oppgje eit gyldig passord", "__language_name__" => "Nynorsk", "Security Warning" => "Tryggleiksåtvaring", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.", "Setup Warning" => "Oppsettsåtvaring", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.", +"Please double check the installation guides." => "Ver venleg og dobbeltsjekk installasjonsrettleiinga.", "Module 'fileinfo' missing" => "Modulen «fileinfo» manglar", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.", "Locale not working" => "Regionaldata fungerer ikkje", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s.", "Internet connection not working" => "Nettilkoplinga fungerer ikkje", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.", "Cron" => "Cron", "Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http.", +"Use systems cron service to call the cron.php file once a minute." => "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet.", "Sharing" => "Deling", "Enable Share API" => "Slå på API-et for deling", "Allow apps to use the Share API" => "La app-ar bruka API-et til deling", "Allow links" => "Tillat lenkjer", "Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer", +"Allow public uploads" => "Tillat offentlege opplastingar", +"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper", "Allow resharing" => "Tillat vidaredeling", "Allow users to share items shared with them again" => "La brukarar vidaredela delte ting", "Allow users to share with anyone" => "La brukarar dela med kven som helst", "Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper", "Security" => "Tryggleik", "Enforce HTTPS" => "Krev HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).", "Log" => "Logg", "Log level" => "Log nivå", "More" => "Meir", @@ -90,8 +103,15 @@ $TRANSLATIONS = array( "Language" => "Språk", "Help translate" => "Hjelp oss å omsetja", "WebDAV" => "WebDAV", +"Use this address to access your Files via WebDAV" => "Bruk denne adressa for å henta filene dine over WebDAV", +"Encryption" => "Kryptering", +"The encryption app is no longer enabled, decrypt all your file" => "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine", +"Log-in password" => "Innloggingspassord", +"Decrypt all Files" => "Dekrypter alle filene", "Login Name" => "Innloggingsnamn", "Create" => "Lag", +"Admin Recovery Password" => "Gjenopprettingspassord for administrator", +"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring", "Default Storage" => "Standardlagring", "Unlimited" => "Ubegrensa", "Other" => "Anna", -- cgit v1.2.3 From 1832eb88726dce70d4f8a0a45bd574b0b688ab26 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 9 Sep 2013 16:57:46 +0200 Subject: Pass view in \OC_Avatar to constructor and use $_ for enable_avatars --- core/avatar/controller.php | 16 ++++++++-------- lib/avatar.php | 41 ++++++++++++++++++++++------------------- settings/personal.php | 1 + settings/templates/personal.php | 2 +- settings/templates/users.php | 4 ++-- settings/users.php | 1 + tests/lib/avatar.php | 12 ++++++------ 7 files changed, 41 insertions(+), 36 deletions(-) (limited to 'lib') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index bc0eb6eff3b..c7624b90b65 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -23,8 +23,8 @@ class Controller { $size = 64; } - $avatar = new \OC_Avatar(); - $image = $avatar->get($user, $size); + $avatar = new \OC_Avatar($user); + $image = $avatar->get($size); \OC_Response::disableCaching(); \OC_Response::setLastModifiedHeader(time()); @@ -63,8 +63,8 @@ class Controller { } try { - $avatar = new \OC_Avatar(); - $avatar->set($user, $newAvatar); + $avatar = new \OC_Avatar($user); + $avatar->set($newAvatar); \OC_JSON::success(); } catch (\OC\NotSquareException $e) { $image = new \OC_Image($newAvatar); @@ -96,8 +96,8 @@ class Controller { $user = \OC_User::getUser(); try { - $avatar = new \OC_Avatar(); - $avatar->remove($user); + $avatar = new \OC_Avatar($user); + $avatar->remove(); \OC_JSON::success(); } catch (\Exception $e) { \OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); @@ -145,8 +145,8 @@ class Controller { $image = new \OC_Image($tmpavatar); $image->crop($crop['x'], $crop['y'], $crop['w'], $crop['h']); try { - $avatar = new \OC_Avatar(); - $avatar->set($user, $image->data()); + $avatar = new \OC_Avatar($user); + $avatar->set($$image->data()); // Clean up \OC_Cache::remove('tmpavatar'); \OC_JSON::success(); diff --git a/lib/avatar.php b/lib/avatar.php index e58a596e13d..c07ef537d50 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -11,46 +11,51 @@ */ class OC_Avatar { + + private $view; + + /** + * @brief constructor + * @param $user string user to do avatar-management with + */ + public function __construct ($user) { + $this->view = new \OC\Files\View('/'.$user); + } + /** * @brief get the users avatar - * @param $user string which user to get the avatar for * @param $size integer size in px of the avatar, defaults to 64 * @return boolean|\OC_Image containing the avatar or false if there's no image */ - public function get ($user, $size = 64) { - $view = new \OC\Files\View('/'.$user); - - if ($view->file_exists('avatar.jpg')) { + public function get ($size = 64) { + if ($thus->view->file_exists('avatar.jpg')) { $ext = 'jpg'; - } elseif ($view->file_exists('avatar.png')) { + } elseif ($this->view->file_exists('avatar.png')) { $ext = 'png'; } else { return false; } $avatar = new OC_Image(); - $avatar->loadFromData($view->file_get_contents('avatar.'.$ext)); + $avatar->loadFromData($this->view->file_get_contents('avatar.'.$ext)); $avatar->resize($size); return $avatar; } /** * @brief sets the users avatar - * @param $user string user to set the avatar for * @param $data mixed imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid * @throws \OC\NotSquareException if the image is not square * @return void */ - public function set ($user, $data) { + public function set ($data) { if (\OC_App::isEnabled('files_encryption')) { $l = \OC_L10N::get('lib'); throw new \Exception($l->t("Custom profile pictures don't work with encryption yet")); } - $view = new \OC\Files\View('/'.$user); - $img = new OC_Image($data); $type = substr($img->mimeType(), -3); if ($type === 'peg') { $type = 'jpg'; } @@ -68,19 +73,17 @@ class OC_Avatar { throw new \OC\NotSquareException(); } - $view->unlink('avatar.jpg'); - $view->unlink('avatar.png'); - $view->file_put_contents('avatar.'.$type, $data); + $this->view->unlink('avatar.jpg'); + $this->view->unlink('avatar.png'); + $this->view->file_put_contents('avatar.'.$type, $data); } /** * @brief remove the users avatar - * @param $user string user to delete the avatar from * @return void */ - public function remove ($user) { - $view = new \OC\Files\View('/'.$user); - $view->unlink('avatar.jpg'); - $view->unlink('avatar.png'); + public function remove () { + $this->view->unlink('avatar.jpg'); + $this->view->unlink('avatar.png'); } } diff --git a/settings/personal.php b/settings/personal.php index 88e8802663d..670e18e20ef 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -89,6 +89,7 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User: $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); $tmpl->assign('enableDecryptAll' , $enableDecryptAll); +$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); $forms=OC_App::getForms('personal'); $tmpl->assign('forms', array()); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 9215115503a..d2ca8154f16 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -80,7 +80,7 @@ if($_['passwordChangeSupported']) { } ?> - +
      t('Profile picture')); ?> diff --git a/settings/templates/users.php b/settings/templates/users.php index 445e5ce2fd5..747d052a7bd 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -81,7 +81,7 @@ $_['subadmingroups'] = array_flip($items); - + @@ -99,7 +99,7 @@ $_['subadmingroups'] = array_flip($items); " data-displayName=""> - + diff --git a/settings/users.php b/settings/users.php index 213d1eecfda..2f1c63a0b59 100644 --- a/settings/users.php +++ b/settings/users.php @@ -81,4 +81,5 @@ $tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'default_quota', $defaultQuota); $tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined); $tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled); +$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); $tmpl->printPage(); diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 027e88d726d..1c5195f8eb1 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -11,16 +11,16 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testAvatar() { $this->markTestSkipped("Setting custom avatars with encryption doesn't work yet"); - $avatar = new \OC_Avatar(); + $avatar = new \OC_Avatar(\OC_User::getUser()); - $this->assertEquals(false, $avatar->get(\OC_User::getUser())); + $this->assertEquals(false, $avatar->get()); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); - $avatar->set(\OC_User::getUser(), $expected->data()); + $avatar->set($expected->data()); $expected->resize(64); - $this->assertEquals($expected->data(), $avatar->get(\OC_User::getUser())->data()); + $this->assertEquals($expected->data(), $avatar->get()->data()); - $avatar->remove(\OC_User::getUser()); - $this->assertEquals(false, $avatar->get(\OC_User::getUser())); + $avatar->remove(); + $this->assertEquals(false, $avatar->get()); } } -- cgit v1.2.3 From 72689f643b631061777149d96f6f170f7722e894 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 10 Sep 2013 10:42:16 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/es_AR.php | 7 ++-- apps/files/l10n/pt_BR.php | 6 +-- apps/files/l10n/ro.php | 37 +++++++++-------- apps/files/l10n/sq.php | 13 ++++-- apps/files_encryption/l10n/fi_FI.php | 12 +++++- apps/files_sharing/l10n/nn_NO.php | 7 ++++ apps/files_sharing/l10n/sq.php | 7 ++++ apps/files_trashbin/l10n/es_AR.php | 5 ++- apps/files_trashbin/l10n/pt_BR.php | 4 +- apps/files_trashbin/l10n/sq.php | 5 ++- apps/files_versions/l10n/nn_NO.php | 3 ++ apps/user_ldap/l10n/nn_NO.php | 1 + apps/user_webdavauth/l10n/nn_NO.php | 4 +- core/l10n/pt_BR.php | 14 +++++-- core/l10n/pt_PT.php | 12 ++++-- core/l10n/sq.php | 22 ++++++++-- l10n/es_AR/files.po | 21 +++++----- l10n/es_AR/files_trashbin.po | 35 ++++++++-------- l10n/fi_FI/files_encryption.po | 33 +++++++-------- l10n/ku_IQ/settings.po | 6 +-- l10n/nn_NO/files_sharing.po | 20 ++++----- l10n/nn_NO/files_versions.po | 14 +++---- l10n/nn_NO/user_ldap.po | 6 +-- l10n/nn_NO/user_webdavauth.po | 10 ++--- l10n/pt_BR/core.po | 34 ++++++++-------- l10n/pt_BR/files.po | 16 ++++---- l10n/pt_BR/files_trashbin.po | 30 +++++++------- l10n/pt_BR/lib.po | 32 +++++++-------- l10n/pt_PT/core.po | 30 +++++++------- l10n/pt_PT/lib.po | 32 +++++++-------- l10n/ro/core.po | 4 +- l10n/ro/files.po | 45 ++++++++++---------- l10n/sq/core.po | 50 +++++++++++------------ l10n/sq/files.po | 79 ++++++++++++++++++------------------ l10n/sq/files_sharing.po | 21 +++++----- l10n/sq/files_trashbin.po | 35 ++++++++-------- l10n/sq/lib.po | 32 +++++++-------- l10n/sq/settings.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_trashbin.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/pt_BR.php | 8 ++-- lib/l10n/pt_PT.php | 8 ++-- lib/l10n/sq.php | 8 ++-- settings/l10n/ku_IQ.php | 1 + settings/l10n/sq.php | 2 + 54 files changed, 438 insertions(+), 363 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index 1c26c10028d..d9d10362630 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -33,9 +33,10 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}", "undo" => "deshacer", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"), +"_%n file_::_%n files_" => array("%n archivo","%n archivos"), +"{dirs} and {files}" => "{carpetas} y {archivos}", +"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), "files uploading" => "Subiendo archivos", "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.", "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index de9644bd588..f9915f251b4 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -33,10 +33,10 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ", "undo" => "desfazer", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"), +"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"), "{dirs} and {files}" => "{dirs} e {files}", -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"), "files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", "File name cannot be empty." => "O nome do arquivo não pode estar vazio.", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 59f6cc68499..0a96eaa2479 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -6,27 +6,27 @@ $TRANSLATIONS = array( "Invalid Token" => "Jeton Invalid", "No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută", "There is no error, the file uploaded with success" => "Nu a apărut nici o 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 upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste marimea maxima permisa 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" => "Nu a fost încărcat nici un fișier", -"Missing a temporary folder" => "Lipsește un director temporar", -"Failed to write to disk" => "Eroare la scriere pe disc", +"Missing a temporary folder" => "Lipsește un dosar temporar", +"Failed to write to disk" => "Eroare la scrierea discului", "Not enough storage available" => "Nu este suficient spațiu disponibil", "Upload failed" => "Încărcarea a eșuat", -"Invalid directory." => "Director invalid.", +"Invalid directory." => "registru invalid.", "Files" => "Fișiere", -"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.", +"Unable to upload your file as it is a directory or has 0 bytes" => "lista nu se poate incarca poate fi un fisier sau are 0 bytes", "Not enough space available" => "Nu este suficient spațiu disponibil", "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.", -"URL cannot be empty." => "Adresa URL nu poate fi goală.", +"URL cannot be empty." => "Adresa URL nu poate fi golita", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud", "Error" => "Eroare", -"Share" => "Partajează", +"Share" => "a imparti", "Delete permanently" => "Stergere permanenta", "Rename" => "Redenumire", -"Pending" => "În așteptare", +"Pending" => "in timpul", "{new_name} already exists" => "{new_name} deja exista", "replace" => "înlocuire", "suggest name" => "sugerează nume", @@ -39,10 +39,11 @@ $TRANSLATIONS = array( "files uploading" => "fișiere se încarcă", "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.", -"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", -"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.", -"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", +"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate", +"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin {spatiu folosit}%", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele", +"Your download is being prepared. This might take some time if the files are big." => "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.", "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", @@ -51,25 +52,25 @@ $TRANSLATIONS = array( "File handling" => "Manipulare fișiere", "Maximum upload size" => "Dimensiune maximă admisă la încărcare", "max. possible: " => "max. posibil:", -"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor", -"Enable ZIP-download" => "Activează descărcare fișiere compresate", +"Needed for multi-file and folder downloads." => "necesar la descarcarea mai multor liste si fisiere", +"Enable ZIP-download" => "permite descarcarea codurilor ZIP", "0 is unlimited" => "0 e nelimitat", "Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate", "Save" => "Salvează", "New" => "Nou", -"Text file" => "Fișier text", +"Text file" => "lista", "Folder" => "Dosar", "From link" => "de la adresa", "Deleted files" => "Sterge fisierele", "Cancel upload" => "Anulează încărcarea", -"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.", +"You don’t have write permissions here." => "Nu ai permisiunea de a scrie aici.", "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!", "Download" => "Descarcă", -"Unshare" => "Anulare partajare", +"Unshare" => "Anulare", "Delete" => "Șterge", "Upload too large" => "Fișierul încărcat este prea mare", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.", -"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.", +"Files are being scanned, please wait." => "Fișierele sunt scanate, asteptati va rog", "Current scanning" => "În curs de scanare", "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.." ); diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index ff09e7b4f95..3207e3a165c 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër", "Could not move %s" => "%s nuk u spostua", +"Unable to set upload directory." => "Nuk është i mundur caktimi i dosjes së ngarkimit.", +"Invalid Token" => "Përmbajtje e pavlefshme", "No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur", "There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:", @@ -11,6 +13,7 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Një dosje e përkohshme nuk u gjet", "Failed to write to disk" => "Ruajtja në disk dështoi", "Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme", +"Upload failed" => "Ngarkimi dështoi", "Invalid directory." => "Dosje e pavlefshme.", "Files" => "Skedarët", "Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte", @@ -18,6 +21,7 @@ $TRANSLATIONS = array( "Upload cancelled." => "Ngarkimi u anulua.", "File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.", "URL cannot be empty." => "URL-i nuk mund të jetë bosh.", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i", "Error" => "Veprim i gabuar", "Share" => "Nda", "Delete permanently" => "Elimino përfundimisht", @@ -29,19 +33,22 @@ $TRANSLATIONS = array( "cancel" => "anulo", "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}", "undo" => "anulo", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"), +"_%n file_::_%n files_" => array("%n skedar","%n skedarë"), +"{dirs} and {files}" => "{dirs} dhe {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"), "files uploading" => "po ngarkoj skedarët", "'.' is an invalid file name." => "'.' është emër i pavlefshëm.", "File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.", "Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.", "Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.", "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.", "Name" => "Emri", "Size" => "Dimensioni", "Modified" => "Modifikuar", +"%s could not be renamed" => "Nuk është i mundur riemërtimi i %s", "Upload" => "Ngarko", "File handling" => "Trajtimi i skedarit", "Maximum upload size" => "Dimensioni maksimal i ngarkimit", diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php index 53b0a6b25cd..b3df41b1f42 100644 --- a/apps/files_encryption/l10n/fi_FI.php +++ b/apps/files_encryption/l10n/fi_FI.php @@ -1,11 +1,21 @@ "Palautusavain kytketty päälle onnistuneesti", "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.", "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.", +"Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Saving..." => "Tallennetaan...", +"personal settings" => "henkilökohtaiset asetukset", "Encryption" => "Salaus", +"Recovery key password" => "Palautusavaimen salasana", "Enabled" => "Käytössä", "Disabled" => "Ei käytössä", -"Change Password" => "Vaihda salasana" +"Change recovery key password:" => "Vaihda palautusavaimen salasana:", +"Old Recovery key password" => "Vanha palautusavaimen salasana", +"New Recovery key password" => "Uusi palautusavaimen salasana", +"Change Password" => "Vaihda salasana", +"Old log-in password" => "Vanha kirjautumis-salasana", +"Current log-in password" => "Nykyinen kirjautumis-salasana", +"Enable password recovery:" => "Ota salasanan palautus käyttöön:" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php index bcb6538b09f..94272943e40 100644 --- a/apps/files_sharing/l10n/nn_NO.php +++ b/apps/files_sharing/l10n/nn_NO.php @@ -1,7 +1,14 @@ "Passordet er gale. Prøv igjen.", "Password" => "Passord", "Submit" => "Send", +"Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.", +"Reasons might be:" => "Moglege grunnar:", +"the item was removed" => "fila/mappa er fjerna", +"the link expired" => "lenkja har gått ut på dato", +"sharing is disabled" => "deling er slått av", +"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.", "%s shared the folder %s with you" => "%s delte mappa %s med deg", "%s shared the file %s with you" => "%s delte fila %s med deg", "Download" => "Last ned", diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php index ae29e5738ff..d2077663e8d 100644 --- a/apps/files_sharing/l10n/sq.php +++ b/apps/files_sharing/l10n/sq.php @@ -1,7 +1,14 @@ "Kodi është i gabuar. Provojeni përsëri.", "Password" => "Kodi", "Submit" => "Parashtro", +"Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.", +"Reasons might be:" => "Arsyet mund të jenë:", +"the item was removed" => "elementi është eliminuar", +"the link expired" => "lidhja ka skaduar", +"sharing is disabled" => "ndarja është çaktivizuar", +"For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.", "%s shared the folder %s with you" => "%s ndau me ju dosjen %s", "%s shared the file %s with you" => "%s ndau me ju skedarin %s", "Download" => "Shkarko", diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php index 6f47255b506..0cb969a3483 100644 --- a/apps/files_trashbin/l10n/es_AR.php +++ b/apps/files_trashbin/l10n/es_AR.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Borrar de manera permanente", "Name" => "Nombre", "Deleted" => "Borrado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n directorio","%n directorios"), +"_%n file_::_%n files_" => array("%n archivo","%n archivos"), +"restored" => "recuperado", "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!", "Restore" => "Recuperar", "Delete" => "Borrar", diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php index 1e3c67ba027..e0e8c8faec6 100644 --- a/apps/files_trashbin/l10n/pt_BR.php +++ b/apps/files_trashbin/l10n/pt_BR.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Excluir permanentemente", "Name" => "Nome", "Deleted" => "Excluído", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n pastas"), +"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"), "restored" => "restaurado", "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!", "Restore" => "Restaurar", diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php index 1b7b5b828c8..50ca7d901b5 100644 --- a/apps/files_trashbin/l10n/sq.php +++ b/apps/files_trashbin/l10n/sq.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Elimino përfundimisht", "Name" => "Emri", "Deleted" => "Eliminuar", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"), +"_%n file_::_%n files_" => array("%n skedar","%n skedarë"), +"restored" => "rivendosur", "Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!", "Restore" => "Rivendos", "Delete" => "Elimino", diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php index 79b518bc18d..608d72aaaed 100644 --- a/apps/files_versions/l10n/nn_NO.php +++ b/apps/files_versions/l10n/nn_NO.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s", "Versions" => "Utgåver", +"Failed to revert {file} to revision {timestamp}." => "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.", +"More versions..." => "Fleire utgåver …", +"No other versions available" => "Ingen andre utgåver tilgjengeleg", "Restore" => "Gjenopprett" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php index 5e584aa31e3..470114d9359 100644 --- a/apps/user_ldap/l10n/nn_NO.php +++ b/apps/user_ldap/l10n/nn_NO.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "Deletion failed" => "Feil ved sletting", "Error" => "Feil", +"Host" => "Tenar", "Password" => "Passord", "Help" => "Hjelp" ); diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php index 519b942f9f5..909231b5f58 100644 --- a/apps/user_webdavauth/l10n/nn_NO.php +++ b/apps/user_webdavauth/l10n/nn_NO.php @@ -1,5 +1,7 @@ "WebDAV-autentisering" +"WebDAV Authentication" => "WebDAV-autentisering", +"Address: " => "Adresse:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 84762cde5e4..7b1c7b3702c 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartilhou »%s« com você", "group" => "grupo", +"Turned on maintenance mode" => "Ativar modo de manutenção", +"Turned off maintenance mode" => "Desligar o modo de manutenção", +"Updated database" => "Atualizar o banco de dados", +"Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...", +"Updated filecache" => "Atualizar cache de arquivo", +"... %d%% done ..." => "... %d%% concluído ...", "Category type not provided." => "Tipo de categoria não fornecido.", "No category to add?" => "Nenhuma categoria a adicionar?", "This category already exists: %s" => "Esta categoria já existe: %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "dezembro", "Settings" => "Ajustes", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array(" ha %n minuto","ha %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("ha %n hora","ha %n horas"), "today" => "hoje", "yesterday" => "ontem", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("ha %n dia","ha %n dias"), "last month" => "último mês", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"), "months ago" => "meses atrás", "last year" => "último ano", "years ago" => "anos atrás", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 2afb9ef9b39..7f4e34cb555 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -2,6 +2,10 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s partilhado »%s« contigo", "group" => "grupo", +"Turned on maintenance mode" => "Activado o modo de manutenção", +"Turned off maintenance mode" => "Desactivado o modo de manutenção", +"Updated database" => "Base de dados actualizada", +"... %d%% done ..." => "... %d%% feito ...", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: %s" => "A categoria já existe: %s", @@ -31,13 +35,13 @@ $TRANSLATIONS = array( "December" => "Dezembro", "Settings" => "Configurações", "seconds ago" => "Minutos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minuto atrás","%n minutos atrás"), +"_%n hour ago_::_%n hours ago_" => array("%n hora atrás","%n horas atrás"), "today" => "hoje", "yesterday" => "ontem", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("%n dia atrás","%n dias atrás"), "last month" => "ultímo mês", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"), "months ago" => "meses atrás", "last year" => "ano passado", "years ago" => "anos atrás", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index 3057ac2c689..6eaa909cad1 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -1,5 +1,13 @@ "%s ndau »%s« me ju", +"group" => "grupi", +"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua", +"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua", +"Updated database" => "Database-i u azhurnua", +"Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...", +"Updated filecache" => "Memorja e skedarëve u azhornua", +"... %d%% done ..." => "... %d%% u krye ...", "Category type not provided." => "Mungon tipi i kategorisë.", "No category to add?" => "Asnjë kategori për të shtuar?", "This category already exists: %s" => "Kjo kategori tashmë ekziston: %s", @@ -29,13 +37,13 @@ $TRANSLATIONS = array( "December" => "Dhjetor", "Settings" => "Parametra", "seconds ago" => "sekonda më parë", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minut më parë","%n minuta më parë"), +"_%n hour ago_::_%n hours ago_" => array("%n orë më parë","%n orë më parë"), "today" => "sot", "yesterday" => "dje", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("%n ditë më parë","%n ditë më parë"), "last month" => "muajin e shkuar", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"), "months ago" => "muaj më parë", "last year" => "vitin e shkuar", "years ago" => "vite më parë", @@ -82,11 +90,13 @@ $TRANSLATIONS = array( "Email sent" => "Email-i u dërgua", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem komunitetin ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.", +"%s password reset" => "Kodi i %s -it u rivendos", "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.
      Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).
      Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.", "Request failed!
      Did you make sure your email/username was right?" => "Kërkesa dështoi!
      A u siguruat që email-i/përdoruesi juaj ishte i saktë?", "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.", "Username" => "Përdoruesi", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?", "Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani", "Request reset" => "Bëj kërkesë për rivendosjen", "Your password was reset" => "Kodi yt u rivendos", @@ -105,9 +115,11 @@ $TRANSLATIONS = array( "Add" => "Shto", "Security Warning" => "Paralajmërim sigurie", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjë krijues numrash të rastësishëm, ju lutem aktivizoni shtesën PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa një krijues numrash të rastësishëm të sigurt një person i huaj mund të jetë në gjendje të parashikojë kodin dhe të marri llogarinë tuaj.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.", +"For information how to properly configure your server, please see the documentation." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni dokumentacionin.", "Create an admin account" => "Krijo një llogari administruesi", "Advanced" => "Të përparuara", "Data folder" => "Emri i dosjes", @@ -119,6 +131,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Tablespace-i i database-it", "Database host" => "Pozicioni (host) i database-it", "Finish setup" => "Mbaro setup-in", +"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.", "Log out" => "Dalje", "Automatic logon rejected!" => "Hyrja automatike u refuzua!", "If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.", @@ -127,6 +140,7 @@ $TRANSLATIONS = array( "remember" => "kujto", "Log in" => "Hyrje", "Alternative Logins" => "Hyrje alternative", +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "Tungjatjeta,

      duam t'ju njoftojmë që %s ka ndarë »%s« me ju.
      Shikojeni!

      Përshëndetje!", "Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 3a53061ec69..511d60fc104 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -5,14 +5,15 @@ # Translators: # Agustin Ferrario , 2013 # cjtess , 2013 +# cnngimenez, 2013 # juliabis, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:50+0000\n" +"Last-Translator: cnngimenez\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" @@ -161,24 +162,24 @@ msgstr "deshacer" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n carpeta" +msgstr[1] "%n carpetas" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n archivo" +msgstr[1] "%n archivos" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{carpetas} y {archivos}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Subiendo %n archivo" +msgstr[1] "Subiendo %n archivos" #: js/filelist.js:628 msgid "files uploading" diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po index bdec790f40d..cf833c421a9 100644 --- a/l10n/es_AR/files_trashbin.po +++ b/l10n/es_AR/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# cjtess , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:50+0000\n" +"Last-Translator: cjtess \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" @@ -27,45 +28,45 @@ msgstr "No fue posible borrar %s de manera permanente" msgid "Couldn't restore %s" msgstr "No se pudo restaurar %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Error" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "Borrar archivo de manera permanente" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Borrar de manera permanente" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Borrado" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n directorio" +msgstr[1] "%n directorios" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n archivo" +msgstr[1] "%n archivos" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "recuperado" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po index d9687472967..b3dea67b927 100644 --- a/l10n/fi_FI/files_encryption.po +++ b/l10n/fi_FI/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# muro , 2013 # Jiri Grönroos , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 19:20+0000\n" +"Last-Translator: muro \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" @@ -20,7 +21,7 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Palautusavain kytketty päälle onnistuneesti" #: ajax/adminrecovery.php:34 msgid "" @@ -62,20 +63,20 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:" #: js/settings-admin.js:11 msgid "Saving..." @@ -93,7 +94,7 @@ msgstr "" #: templates/invalid_private_key.php:7 msgid "personal settings" -msgstr "" +msgstr "henkilökohtaiset asetukset" #: templates/settings-admin.php:5 templates/settings-personal.php:4 msgid "Encryption" @@ -106,7 +107,7 @@ msgstr "" #: templates/settings-admin.php:14 msgid "Recovery key password" -msgstr "" +msgstr "Palautusavaimen salasana" #: templates/settings-admin.php:21 templates/settings-personal.php:54 msgid "Enabled" @@ -118,15 +119,15 @@ msgstr "Ei käytössä" #: templates/settings-admin.php:34 msgid "Change recovery key password:" -msgstr "" +msgstr "Vaihda palautusavaimen salasana:" #: templates/settings-admin.php:41 msgid "Old Recovery key password" -msgstr "" +msgstr "Vanha palautusavaimen salasana" #: templates/settings-admin.php:48 msgid "New Recovery key password" -msgstr "" +msgstr "Uusi palautusavaimen salasana" #: templates/settings-admin.php:53 msgid "Change Password" @@ -148,11 +149,11 @@ msgstr "" #: templates/settings-personal.php:24 msgid "Old log-in password" -msgstr "" +msgstr "Vanha kirjautumis-salasana" #: templates/settings-personal.php:30 msgid "Current log-in password" -msgstr "" +msgstr "Nykyinen kirjautumis-salasana" #: templates/settings-personal.php:35 msgid "Update Private Key Password" @@ -160,7 +161,7 @@ msgstr "" #: templates/settings-personal.php:45 msgid "Enable password recovery:" -msgstr "" +msgstr "Ota salasanan palautus käyttöön:" #: templates/settings-personal.php:47 msgid "" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index e34460a4f06..9872d23429c 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: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 19:30+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" @@ -64,7 +64,7 @@ msgstr "" #: ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" -msgstr "" +msgstr "داواکارى نادروستە" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 6e230da77ce..30895eb8668 100644 --- a/l10n/nn_NO/files_sharing.po +++ b/l10n/nn_NO/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: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 07:50+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: templates/authenticate.php:4 msgid "The password is wrong. Try again." -msgstr "" +msgstr "Passordet er gale. Prøv igjen." #: templates/authenticate.php:7 msgid "Password" @@ -32,27 +32,27 @@ msgstr "Send" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Orsak, denne lenkja fungerer visst ikkje lenger." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Moglege grunnar:" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "fila/mappa er fjerna" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "lenkja har gått ut på dato" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "deling er slått av" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon." #: templates/public.php:15 #, php-format diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po index a6e633a4c28..bb94b8df8e7 100644 --- a/l10n/nn_NO/files_versions.po +++ b/l10n/nn_NO/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 07:50+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,16 +29,16 @@ msgstr "Utgåver" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "Fleire utgåver …" #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "Ingen andre utgåver tilgjengeleg" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Gjenopprett" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index 4113e6e91a1..50449bc4e8a 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 09:20+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" @@ -108,7 +108,7 @@ msgstr "" #: templates/settings.php:37 msgid "Host" -msgstr "" +msgstr "Tenar" #: templates/settings.php:39 msgid "" diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po index 05d3c32b03d..59e481b97fd 100644 --- a/l10n/nn_NO/user_webdavauth.po +++ b/l10n/nn_NO/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: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 07:50+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +24,11 @@ msgstr "WebDAV-autentisering" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Adresse:" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige." diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index f2fe5bb3097..95c5f1a6021 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:20+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,28 +30,28 @@ msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Ativar modo de manutenção" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Desligar o modo de manutenção" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Atualizar o banco de dados" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Atualizar cahe de arquivos, isto pode levar algum tempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Atualizar cache de arquivo" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% concluído ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -179,14 +179,14 @@ msgstr "segundos atrás" #: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " ha %n minuto" +msgstr[1] "ha %n minutos" #: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ha %n hora" +msgstr[1] "ha %n horas" #: js/js.js:824 msgid "today" @@ -199,8 +199,8 @@ msgstr "ontem" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ha %n dia" +msgstr[1] "ha %n dias" #: js/js.js:827 msgid "last month" @@ -209,8 +209,8 @@ msgstr "último mês" #: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ha %n mês" +msgstr[1] "ha %n meses" #: js/js.js:829 msgid "months ago" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 53543fba7d5..258f0d4461c 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-03 07:42-0400\n" -"PO-Revision-Date: 2013-09-02 15:40+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:30+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -161,14 +161,14 @@ msgstr "desfazer" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n pasta" +msgstr[1] "%n pastas" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n arquivo" +msgstr[1] "%n arquivos" #: js/filelist.js:432 msgid "{dirs} and {files}" @@ -177,8 +177,8 @@ msgstr "{dirs} e {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Enviando %n arquivo" +msgstr[1] "Enviando %n arquivos" #: js/filelist.js:628 msgid "files uploading" diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po index 3464db7a911..3b2ef25c158 100644 --- a/l10n/pt_BR/files_trashbin.po +++ b/l10n/pt_BR/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:30+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,43 +28,43 @@ msgstr "Não foi possível excluir %s permanentemente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "realizar operação de restauração" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Erro" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "excluir arquivo permanentemente" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Excluir permanentemente" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Excluído" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n pastas" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n arquivo" +msgstr[1] "%n arquivos" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "restaurado" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index d35e68a4ec1..93b24783ce8 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 12:50+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 13:20+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -265,51 +265,51 @@ msgstr "Seu servidor web não está configurado corretamente para permitir sincr msgid "Please double check the installation guides." msgstr "Por favor, confira os guias de instalação." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "segundos atrás" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "ha %n minutos" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "ha %n horas" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "hoje" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "ontem" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "ha %n dias" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "último mês" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "ha %n meses" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "último ano" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "anos atrás" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 9b748ac3e69..0af6cd62e19 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/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: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 08:50+0000\n" +"Last-Translator: Helder Meneses \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" @@ -32,15 +32,15 @@ msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Activado o modo de manutenção" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Desactivado o modo de manutenção" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de dados actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." @@ -53,7 +53,7 @@ msgstr "" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% feito ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -181,14 +181,14 @@ msgstr "Minutos atrás" #: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n minuto atrás" +msgstr[1] "%n minutos atrás" #: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n hora atrás" +msgstr[1] "%n horas atrás" #: js/js.js:824 msgid "today" @@ -201,8 +201,8 @@ msgstr "ontem" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dia atrás" +msgstr[1] "%n dias atrás" #: js/js.js:827 msgid "last month" @@ -211,8 +211,8 @@ msgstr "ultímo mês" #: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n mês atrás" +msgstr[1] "%n meses atrás" #: js/js.js:829 msgid "months ago" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index b7393d9b03a..f6f24ab8da1 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 08:50+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" @@ -265,51 +265,51 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s msgid "Please double check the installation guides." msgstr "Por favor verifique installation guides." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "Minutos atrás" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n minutos atrás" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n horas atrás" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "hoje" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "ontem" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n dias atrás" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "ultímo mês" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n meses atrás" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "ano passado" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "anos atrás" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 4e3456dff0e..b0bcda7f541 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 14:30+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" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index c25183110d0..1d6755cb53e 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -4,15 +4,16 @@ # # Translators: # dimaursu16 , 2013 +# inaina , 2013 # ripkid666 , 2013 # sergiu_sechel , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-10 14:41+0000\n" +"Last-Translator: inaina \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" @@ -49,7 +50,7 @@ msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes" #: ajax/upload.php:67 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: " +msgstr "Fisierul incarcat depaseste marimea maxima permisa in php.ini: " #: ajax/upload.php:69 msgid "" @@ -67,11 +68,11 @@ msgstr "Nu a fost încărcat nici un fișier" #: ajax/upload.php:72 msgid "Missing a temporary folder" -msgstr "Lipsește un director temporar" +msgstr "Lipsește un dosar temporar" #: ajax/upload.php:73 msgid "Failed to write to disk" -msgstr "Eroare la scriere pe disc" +msgstr "Eroare la scrierea discului" #: ajax/upload.php:91 msgid "Not enough storage available" @@ -83,7 +84,7 @@ msgstr "Încărcarea a eșuat" #: ajax/upload.php:127 msgid "Invalid directory." -msgstr "Director invalid." +msgstr "registru invalid." #: appinfo/app.php:12 msgid "Files" @@ -91,7 +92,7 @@ msgstr "Fișiere" #: js/file-upload.js:11 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." +msgstr "lista nu se poate incarca poate fi un fisier sau are 0 bytes" #: js/file-upload.js:24 msgid "Not enough space available" @@ -108,7 +109,7 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup #: js/file-upload.js:239 msgid "URL cannot be empty." -msgstr "Adresa URL nu poate fi goală." +msgstr "Adresa URL nu poate fi golita" #: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" @@ -120,7 +121,7 @@ msgstr "Eroare" #: js/fileactions.js:116 msgid "Share" -msgstr "Partajează" +msgstr "a imparti" #: js/fileactions.js:126 msgid "Delete permanently" @@ -132,7 +133,7 @@ msgstr "Redenumire" #: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" -msgstr "În așteptare" +msgstr "in timpul" #: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" @@ -199,27 +200,27 @@ msgstr "Numele fișierului nu poate rămâne gol." msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise." +msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise." #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" -msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere." +msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate" #: js/files.js:82 msgid "Your storage is almost full ({usedSpacePercent}%)" -msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)" +msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%" #: js/files.js:94 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele" #: js/files.js:245 msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari." +msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari." #: js/files.js:563 templates/index.php:69 msgid "Name" @@ -256,11 +257,11 @@ msgstr "max. posibil:" #: templates/admin.php:15 msgid "Needed for multi-file and folder downloads." -msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor" +msgstr "necesar la descarcarea mai multor liste si fisiere" #: templates/admin.php:17 msgid "Enable ZIP-download" -msgstr "Activează descărcare fișiere compresate" +msgstr "permite descarcarea codurilor ZIP" #: templates/admin.php:20 msgid "0 is unlimited" @@ -280,7 +281,7 @@ msgstr "Nou" #: templates/index.php:10 msgid "Text file" -msgstr "Fișier text" +msgstr "lista" #: templates/index.php:12 msgid "Folder" @@ -300,7 +301,7 @@ msgstr "Anulează încărcarea" #: templates/index.php:52 msgid "You don’t have write permissions here." -msgstr "Nu ai permisiunea de a sterge fisiere aici." +msgstr "Nu ai permisiunea de a scrie aici." #: templates/index.php:59 msgid "Nothing in here. Upload something!" @@ -312,7 +313,7 @@ msgstr "Descarcă" #: templates/index.php:88 templates/index.php:89 msgid "Unshare" -msgstr "Anulare partajare" +msgstr "Anulare" #: templates/index.php:94 templates/index.php:95 msgid "Delete" @@ -330,7 +331,7 @@ msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la #: templates/index.php:115 msgid "Files are being scanned, please wait." -msgstr "Fișierele sunt scanate, te rog așteptă." +msgstr "Fișierele sunt scanate, asteptati va rog" #: templates/index.php:118 msgid "Current scanning" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 165384e9f00..915ef08c5f9 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 23:00+0000\n" +"Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,36 +22,36 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "%s shared »%s« with you" -msgstr "" +msgstr "%s ndau »%s« me ju" #: ajax/share.php:227 msgid "group" -msgstr "" +msgstr "grupi" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Mënyra e mirëmbajtjes u aktivizua" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Mënyra e mirëmbajtjes u çaktivizua" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Database-i u azhurnua" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Memorja e skedarëve u azhornua" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% u krye ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -179,14 +179,14 @@ msgstr "sekonda më parë" #: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n minut më parë" +msgstr[1] "%n minuta më parë" #: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n orë më parë" +msgstr[1] "%n orë më parë" #: js/js.js:824 msgid "today" @@ -199,8 +199,8 @@ msgstr "dje" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n ditë më parë" +msgstr[1] "%n ditë më parë" #: js/js.js:827 msgid "last month" @@ -209,8 +209,8 @@ msgstr "muajin e shkuar" #: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n muaj më parë" +msgstr[1] "%n muaj më parë" #: js/js.js:829 msgid "months ago" @@ -407,7 +407,7 @@ msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i." #: lostpassword/controller.php:62 #, php-format msgid "%s password reset" -msgstr "" +msgstr "Kodi i %s -it u rivendos" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -439,7 +439,7 @@ msgid "" "will be no way to get your data back after your password is reset. If you " "are not sure what to do, please contact your administrator before you " "continue. Do you really want to continue?" -msgstr "" +msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?" #: lostpassword/templates/lostpassword.php:24 msgid "Yes, I really want to reset my password now" @@ -524,7 +524,7 @@ msgstr "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2 #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt." #: templates/installation.php:32 msgid "" @@ -549,7 +549,7 @@ msgstr "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga i msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni dokumentacionin." #: templates/installation.php:47 msgid "Create an admin account" @@ -600,7 +600,7 @@ msgstr "Mbaro setup-in" #: templates/layout.user.php:41 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin." #: templates/layout.user.php:66 msgid "Log out" @@ -641,7 +641,7 @@ msgstr "Hyrje alternative" msgid "" "Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" -msgstr "" +msgstr "Tungjatjeta,

      duam t'ju njoftojmë që %s ka ndarë »%s« me ju.
      Shikojeni!

      Përshëndetje!" #: templates/update.php:3 #, php-format diff --git a/l10n/sq/files.po b/l10n/sq/files.po index 506285caa5a..949da8324ff 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Odeen , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 23:10+0000\n" +"Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,11 +30,11 @@ msgstr "%s nuk u spostua" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "Nuk është i mundur caktimi i dosjes së ngarkimit." #: ajax/upload.php:22 msgid "Invalid Token" -msgstr "" +msgstr "Përmbajtje e pavlefshme" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" @@ -76,7 +77,7 @@ msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme" #: ajax/upload.php:109 msgid "Upload failed" -msgstr "" +msgstr "Ngarkimi dështoi" #: ajax/upload.php:127 msgid "Invalid directory." @@ -109,9 +110,9 @@ msgstr "URL-i nuk mund të jetë bosh." #: js/file-upload.js:244 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Veprim i gabuar" @@ -127,57 +128,57 @@ msgstr "Elimino përfundimisht" msgid "Rename" msgstr "Riemërto" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Pezulluar" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} ekziston" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "zëvëndëso" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sugjero një emër" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "anulo" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "U zëvëndësua {new_name} me {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "anulo" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dosje" +msgstr[1] "%n dosje" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n skedar" +msgstr[1] "%n skedarë" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} dhe {files}" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Po ngarkoj %n skedar" +msgstr[1] "Po ngarkoj %n skedarë" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "po ngarkoj skedarët" @@ -207,7 +208,7 @@ msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj." #: js/files.js:245 msgid "" @@ -215,22 +216,22 @@ msgid "" "big." msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Emri" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Dimensioni" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modifikuar" #: lib/app.php:73 #, php-format msgid "%s could not be renamed" -msgstr "" +msgstr "Nuk është i mundur riemërtimi i %s" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" @@ -300,33 +301,33 @@ msgstr "Nuk keni të drejta për të shkruar këtu." msgid "Nothing in here. Upload something!" msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Shkarko" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Hiq ndarjen" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Elimino" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Ngarkimi është shumë i madh" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Skedarët po analizohen, ju lutemi pritni." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Analizimi aktual" diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po index 6a808e24cee..f9206290886 100644 --- a/l10n/sq/files_sharing.po +++ b/l10n/sq/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Odeen , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 23:40+0000\n" +"Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: templates/authenticate.php:4 msgid "The password is wrong. Try again." -msgstr "" +msgstr "Kodi është i gabuar. Provojeni përsëri." #: templates/authenticate.php:7 msgid "Password" @@ -31,27 +32,27 @@ msgstr "Parashtro" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Arsyet mund të jenë:" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "elementi është eliminuar" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "lidhja ka skaduar" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "ndarja është çaktivizuar" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje." #: templates/public.php:15 #, php-format diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po index cd243657ba0..a359590d575 100644 --- a/l10n/sq/files_trashbin.po +++ b/l10n/sq/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Odeen , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 23:00+0000\n" +"Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,45 +28,45 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s" msgid "Couldn't restore %s" msgstr "Nuk munda ta rivendos %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "ekzekuto operacionin e rivendosjes" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Veprim i gabuar" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "eliminoje përfundimisht skedarin" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Elimino përfundimisht" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Emri" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Eliminuar" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dosje" +msgstr[1] "%n dosje" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n skedar" +msgstr[1] "%n skedarë" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "rivendosur" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po index 84fd768e0f8..87c35751041 100644 --- a/l10n/sq/lib.po +++ b/l10n/sq/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 22:50+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" @@ -264,51 +264,51 @@ msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkro msgid "Please double check the installation guides." msgstr "Ju lutemi kontrolloni mirë shoqëruesin e instalimit." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "sekonda më parë" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n minuta më parë" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n orë më parë" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "sot" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "dje" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n ditë më parë" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "muajin e shkuar" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n muaj më parë" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "vitin e shkuar" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "vite më parë" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 2e15e7dd55c..3f7c530d73b 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: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"PO-Revision-Date: 2013-09-09 23:30+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" @@ -64,7 +64,7 @@ msgstr "" #: ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" -msgstr "" +msgstr "Kërkesë e pavlefshme" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" @@ -517,7 +517,7 @@ msgstr "" #: templates/users.php:66 templates/users.php:157 msgid "Other" -msgstr "" +msgstr "Të tjera" #: templates/users.php:84 msgid "Username" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 94510245f01..44fea90143b 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 d62094f9cf6..9696122a837 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 1c7870c896f..9e43dd73aff 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 19b9e18a9ba..b6a76cb00fc 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 69ca7c42eb1..1ff57c35ad2 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index fc02293be45..8e4e83df745 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 39cecad8d86..a88051bb451 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 85091b1012d..dd7d5cd1bd9 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 8ace2ff3749..cdb551ec943 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 9f91cb4008c..9024b177c38 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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 b5aea8713d6..8fc98e5791f 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" +"POT-Creation-Date: 2013-09-10 10:41-0400\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/pt_BR.php b/lib/l10n/pt_BR.php index a2379ca4883..72bc1f36a1e 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -54,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.", "Please double check the installation guides." => "Por favor, confira os guias de instalação.", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","ha %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("","ha %n horas"), "today" => "hoje", "yesterday" => "ontem", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","ha %n dias"), "last month" => "último mês", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","ha %n meses"), "last year" => "último ano", "years ago" => "anos atrás", "Caused by:" => "Causados ​​por:", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index c8a2f78cbf5..bf540012249 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -40,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the installation guides." => "Por favor verifique installation guides.", "seconds ago" => "Minutos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"), +"_%n hour ago_::_%n hours ago_" => array("","%n horas atrás"), "today" => "hoje", "yesterday" => "ontem", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","%n dias atrás"), "last month" => "ultímo mês", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","%n meses atrás"), "last year" => "ano passado", "years ago" => "anos atrás", "Caused by:" => "Causado por:", diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php index c2447b7ea23..edaa1df2b86 100644 --- a/lib/l10n/sq.php +++ b/lib/l10n/sq.php @@ -36,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.", "Please double check the installation guides." => "Ju lutemi kontrolloni mirë shoqëruesin e instalimit.", "seconds ago" => "sekonda më parë", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","%n minuta më parë"), +"_%n hour ago_::_%n hours ago_" => array("","%n orë më parë"), "today" => "sot", "yesterday" => "dje", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","%n ditë më parë"), "last month" => "muajin e shkuar", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","%n muaj më parë"), "last year" => "vitin e shkuar", "years ago" => "vite më parë", "Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet" diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php index 4549dcea52c..d0a8abea713 100644 --- a/settings/l10n/ku_IQ.php +++ b/settings/l10n/ku_IQ.php @@ -1,5 +1,6 @@ "داواکارى نادروستە", "Enable" => "چالاککردن", "Error" => "هه‌ڵه", "Update" => "نوێکردنه‌وه", diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php index facffb9ba18..d4726a29bb6 100644 --- a/settings/l10n/sq.php +++ b/settings/l10n/sq.php @@ -1,6 +1,7 @@ "Veprim i gabuar gjatë vërtetimit të identitetit", +"Invalid request" => "Kërkesë e pavlefshme", "Error" => "Veprim i gabuar", "Update" => "Azhurno", "undo" => "anulo", @@ -11,6 +12,7 @@ $TRANSLATIONS = array( "Password" => "Kodi", "New password" => "Kodi i ri", "Email" => "Email-i", +"Other" => "Të tjera", "Username" => "Përdoruesi" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; -- cgit v1.2.3 From 315344eb9cc58dda23bfe52c1413ad963265a9cb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Sep 2013 19:34:38 +0200 Subject: move public files api to a clearer namespace --- lib/public/files/file.php | 44 ++++++++++++++++ lib/public/files/folder.php | 104 +++++++++++++++++++++++++++++++++++++ lib/public/files/node.php | 108 +++++++++++++++++++++++++++++++++++++++ lib/public/files/node/file.php | 44 ---------------- lib/public/files/node/folder.php | 104 ------------------------------------- lib/public/files/node/node.php | 108 --------------------------------------- 6 files changed, 256 insertions(+), 256 deletions(-) create mode 100644 lib/public/files/file.php create mode 100644 lib/public/files/folder.php create mode 100644 lib/public/files/node.php delete mode 100644 lib/public/files/node/file.php delete mode 100644 lib/public/files/node/folder.php delete mode 100644 lib/public/files/node/node.php (limited to 'lib') diff --git a/lib/public/files/file.php b/lib/public/files/file.php new file mode 100644 index 00000000000..c571e184cee --- /dev/null +++ b/lib/public/files/file.php @@ -0,0 +1,44 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +use OC\Files\NotPermittedException; + +interface File extends Node { + /** + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getContent(); + + /** + * @param string $data + * @throws \OC\Files\NotPermittedException + */ + public function putContent($data); + + /** + * @return string + */ + public function getMimeType(); + + /** + * @param string $mode + * @return resource + * @throws \OC\Files\NotPermittedException + */ + public function fopen($mode); + + /** + * @param string $type + * @param bool $raw + * @return string + */ + public function hash($type, $raw = false); +} diff --git a/lib/public/files/folder.php b/lib/public/files/folder.php new file mode 100644 index 00000000000..a8e57f7ae23 --- /dev/null +++ b/lib/public/files/folder.php @@ -0,0 +1,104 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +use OC\Files\Cache\Cache; +use OC\Files\Cache\Scanner; +use OC\Files\NotFoundException; +use OC\Files\NotPermittedException; + +interface Folder extends Node { + /** + * @param string $path path relative to the folder + * @return string + * @throws \OC\Files\NotPermittedException + */ + public function getFullPath($path); + + /** + * @param string $path + * @throws \OC\Files\NotFoundException + * @return string + */ + public function getRelativePath($path); + + /** + * check if a node is a (grand-)child of the folder + * + * @param \OCP\Files\Node $node + * @return bool + */ + public function isSubNode($node); + + /** + * get the content of this directory + * + * @throws \OC\Files\NotFoundException + * @return \OCP\Files\Node[] + */ + public function getDirectoryListing(); + + /** + * Get the node at $path + * + * @param string $path + * @return \OCP\Files\Node + * @throws \OC\Files\NotFoundException + */ + public function get($path); + + /** + * @param string $path + * @return bool + */ + public function nodeExists($path); + + /** + * @param string $path + * @return \OCP\Files\Folder + * @throws NotPermittedException + */ + public function newFolder($path); + + /** + * @param string $path + * @return \OCP\Files\File + * @throws NotPermittedException + */ + public function newFile($path); + + /** + * search for files with the name matching $query + * + * @param string $query + * @return \OCP\Files\Node[] + */ + public function search($query); + + /** + * search for files by mimetype + * + * @param string $mimetype + * @return \OCP\Files\Node[] + */ + public function searchByMime($mimetype); + + /** + * @param $id + * @return \OCP\Files\Node[] + */ + public function getById($id); + + public function getFreeSpace(); + + /** + * @return bool + */ + public function isCreatable(); +} diff --git a/lib/public/files/node.php b/lib/public/files/node.php new file mode 100644 index 00000000000..d3b71803f50 --- /dev/null +++ b/lib/public/files/node.php @@ -0,0 +1,108 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +interface Node { + /** + * @param string $targetPath + * @throws \OC\Files\NotPermittedException + * @return \OCP\Files\Node + */ + public function move($targetPath); + + public function delete(); + + /** + * @param string $targetPath + * @return \OCP\Files\Node + */ + public function copy($targetPath); + + /** + * @param int $mtime + * @throws \OC\Files\NotPermittedException + */ + public function touch($mtime = null); + + /** + * @return \OC\Files\Storage\Storage + * @throws \OC\Files\NotFoundException + */ + public function getStorage(); + + /** + * @return string + */ + public function getPath(); + + /** + * @return string + */ + public function getInternalPath(); + + /** + * @return int + */ + public function getId(); + + /** + * @return array + */ + public function stat(); + + /** + * @return int + */ + public function getMTime(); + + /** + * @return int + */ + public function getSize(); + + /** + * @return string + */ + public function getEtag(); + + /** + * @return int + */ + public function getPermissions(); + + /** + * @return bool + */ + public function isReadable(); + + /** + * @return bool + */ + public function isUpdateable(); + + /** + * @return bool + */ + public function isDeletable(); + + /** + * @return bool + */ + public function isShareable(); + + /** + * @return Node + */ + public function getParent(); + + /** + * @return string + */ + public function getName(); +} diff --git a/lib/public/files/node/file.php b/lib/public/files/node/file.php deleted file mode 100644 index 193663f60b8..00000000000 --- a/lib/public/files/node/file.php +++ /dev/null @@ -1,44 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OCP\Files\Node; - -use OC\Files\NotPermittedException; - -interface File extends Node { - /** - * @return string - * @throws \OC\Files\NotPermittedException - */ - public function getContent(); - - /** - * @param string $data - * @throws \OC\Files\NotPermittedException - */ - public function putContent($data); - - /** - * @return string - */ - public function getMimeType(); - - /** - * @param string $mode - * @return resource - * @throws \OC\Files\NotPermittedException - */ - public function fopen($mode); - - /** - * @param string $type - * @param bool $raw - * @return string - */ - public function hash($type, $raw = false); -} diff --git a/lib/public/files/node/folder.php b/lib/public/files/node/folder.php deleted file mode 100644 index af53bc9e584..00000000000 --- a/lib/public/files/node/folder.php +++ /dev/null @@ -1,104 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OCP\Files\Node; - -use OC\Files\Cache\Cache; -use OC\Files\Cache\Scanner; -use OC\Files\NotFoundException; -use OC\Files\NotPermittedException; - -interface Folder extends Node { - /** - * @param string $path path relative to the folder - * @return string - * @throws \OC\Files\NotPermittedException - */ - public function getFullPath($path); - - /** - * @param string $path - * @throws \OC\Files\NotFoundException - * @return string - */ - public function getRelativePath($path); - - /** - * check if a node is a (grand-)child of the folder - * - * @param \OCP\Files\Node\Node $node - * @return bool - */ - public function isSubNode($node); - - /** - * get the content of this directory - * - * @throws \OC\Files\NotFoundException - * @return \OCP\Files\Node\Node[] - */ - public function getDirectoryListing(); - - /** - * Get the node at $path - * - * @param string $path - * @return \OCP\Files\Node\Node - * @throws \OC\Files\NotFoundException - */ - public function get($path); - - /** - * @param string $path - * @return bool - */ - public function nodeExists($path); - - /** - * @param string $path - * @return \OCP\Files\Node\Folder - * @throws NotPermittedException - */ - public function newFolder($path); - - /** - * @param string $path - * @return \OCP\Files\Node\File - * @throws NotPermittedException - */ - public function newFile($path); - - /** - * search for files with the name matching $query - * - * @param string $query - * @return \OCP\Files\Node\Node[] - */ - public function search($query); - - /** - * search for files by mimetype - * - * @param string $mimetype - * @return \OCP\Files\Node\Node[] - */ - public function searchByMime($mimetype); - - /** - * @param $id - * @return \OCP\Files\Node\Node[] - */ - public function getById($id); - - public function getFreeSpace(); - - /** - * @return bool - */ - public function isCreatable(); -} diff --git a/lib/public/files/node/node.php b/lib/public/files/node/node.php deleted file mode 100644 index b85f37e69a7..00000000000 --- a/lib/public/files/node/node.php +++ /dev/null @@ -1,108 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OCP\Files\Node; - -interface Node { - /** - * @param string $targetPath - * @throws \OC\Files\NotPermittedException - * @return \OCP\Files\Node\Node - */ - public function move($targetPath); - - public function delete(); - - /** - * @param string $targetPath - * @return \OCP\Files\Node\Node - */ - public function copy($targetPath); - - /** - * @param int $mtime - * @throws \OC\Files\NotPermittedException - */ - public function touch($mtime = null); - - /** - * @return \OC\Files\Storage\Storage - * @throws \OC\Files\NotFoundException - */ - public function getStorage(); - - /** - * @return string - */ - public function getPath(); - - /** - * @return string - */ - public function getInternalPath(); - - /** - * @return int - */ - public function getId(); - - /** - * @return array - */ - public function stat(); - - /** - * @return int - */ - public function getMTime(); - - /** - * @return int - */ - public function getSize(); - - /** - * @return string - */ - public function getEtag(); - - /** - * @return int - */ - public function getPermissions(); - - /** - * @return bool - */ - public function isReadable(); - - /** - * @return bool - */ - public function isUpdateable(); - - /** - * @return bool - */ - public function isDeletable(); - - /** - * @return bool - */ - public function isShareable(); - - /** - * @return Node - */ - public function getParent(); - - /** - * @return string - */ - public function getName(); -} -- cgit v1.2.3 From e271a55783dafd605791d02ca718b463fa19d58d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Sep 2013 19:44:23 +0200 Subject: move filesystem expceptions to global namespace --- lib/files/node/file.php | 14 ++++----- lib/files/node/folder.php | 32 ++++++++++---------- lib/files/node/node.php | 14 ++++----- lib/files/node/nonexistingfile.php | 4 +-- lib/files/node/nonexistingfolder.php | 4 +-- lib/files/node/root.php | 44 ++++++++++++++-------------- lib/public/files/alreadyexistsexception.php | 11 +++++++ lib/public/files/notenoughspaceexception.php | 11 +++++++ lib/public/files/notfoundexception.php | 11 +++++++ lib/public/files/notpermittedexception.php | 11 +++++++ 10 files changed, 99 insertions(+), 57 deletions(-) create mode 100644 lib/public/files/alreadyexistsexception.php create mode 100644 lib/public/files/notenoughspaceexception.php create mode 100644 lib/public/files/notfoundexception.php create mode 100644 lib/public/files/notpermittedexception.php (limited to 'lib') diff --git a/lib/files/node/file.php b/lib/files/node/file.php index f13b474aa6c..75d5e0166b6 100644 --- a/lib/files/node/file.php +++ b/lib/files/node/file.php @@ -8,12 +8,12 @@ namespace OC\Files\Node; -use OC\Files\NotPermittedException; +use OCP\Files\NotPermittedException; -class File extends Node implements \OCP\Files\Node\File { +class File extends Node implements \OCP\Files\File { /** * @return string - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function getContent() { if ($this->checkPermissions(\OCP\PERMISSION_READ)) { @@ -28,7 +28,7 @@ class File extends Node implements \OCP\Files\Node\File { /** * @param string $data - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function putContent($data) { if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) { @@ -50,7 +50,7 @@ class File extends Node implements \OCP\Files\Node\File { /** * @param string $mode * @return resource - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function fopen($mode) { $preHooks = array(); @@ -101,7 +101,7 @@ class File extends Node implements \OCP\Files\Node\File { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function copy($targetPath) { @@ -123,7 +123,7 @@ class File extends Node implements \OCP\Files\Node\File { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function move($targetPath) { diff --git a/lib/files/node/folder.php b/lib/files/node/folder.php index daf75d7c23e..923f53821b2 100644 --- a/lib/files/node/folder.php +++ b/lib/files/node/folder.php @@ -10,14 +10,14 @@ namespace OC\Files\Node; use OC\Files\Cache\Cache; use OC\Files\Cache\Scanner; -use OC\Files\NotFoundException; -use OC\Files\NotPermittedException; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; -class Folder extends Node implements \OCP\Files\Node\Folder { +class Folder extends Node implements \OCP\Files\Folder { /** * @param string $path path relative to the folder * @return string - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function getFullPath($path) { if (!$this->isValidPath($path)) { @@ -28,7 +28,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $path - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException * @return string */ public function getRelativePath($path) { @@ -60,7 +60,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * get the content of this directory * - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException * @return Node[] */ public function getDirectoryListing() { @@ -164,7 +164,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { * * @param string $path * @return \OC\Files\Node\Node - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function get($path) { return $this->root->get($this->getFullPath($path)); @@ -185,8 +185,8 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $path - * @return Folder - * @throws NotPermittedException + * @return \OC\Files\Node\Folder + * @throws \OCP\Files\NotPermittedException */ public function newFolder($path) { if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) { @@ -206,8 +206,8 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $path - * @return File - * @throws NotPermittedException + * @return \OC\Files\Node\File + * @throws \OCP\Files\NotPermittedException */ public function newFile($path) { if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) { @@ -229,7 +229,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { * search for files with the name matching $query * * @param string $query - * @return Node[] + * @return \OC\Files\Node\Node[] */ public function search($query) { return $this->searchCommon('%' . $query . '%', 'search'); @@ -248,7 +248,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $query * @param string $method - * @return Node[] + * @return \OC\Files\Node\Node[] */ private function searchCommon($query, $method) { $files = array(); @@ -298,7 +298,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param $id - * @return Node[] + * @return \OC\Files\Node\Node[] */ public function getById($id) { $nodes = $this->root->getById($id); @@ -337,7 +337,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function copy($targetPath) { @@ -359,7 +359,7 @@ class Folder extends Node implements \OCP\Files\Node\Folder { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function move($targetPath) { diff --git a/lib/files/node/node.php b/lib/files/node/node.php index 5ee9f23161f..063e2424a64 100644 --- a/lib/files/node/node.php +++ b/lib/files/node/node.php @@ -10,12 +10,10 @@ namespace OC\Files\Node; use OC\Files\Cache\Cache; use OC\Files\Cache\Scanner; -use OC\Files\NotFoundException; -use OC\Files\NotPermittedException; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; -require_once 'files/exceptions.php'; - -class Node implements \OCP\Files\Node\Node { +class Node implements \OCP\Files\Node { /** * @var \OC\Files\View $view */ @@ -61,7 +59,7 @@ class Node implements \OCP\Files\Node\Node { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function move($targetPath) { @@ -82,7 +80,7 @@ class Node implements \OCP\Files\Node\Node { /** * @param int $mtime - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function touch($mtime = null) { if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) { @@ -96,7 +94,7 @@ class Node implements \OCP\Files\Node\Node { /** * @return \OC\Files\Storage\Storage - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function getStorage() { list($storage,) = $this->view->resolvePath($this->path); diff --git a/lib/files/node/nonexistingfile.php b/lib/files/node/nonexistingfile.php index 6f18450efee..d45076f7fee 100644 --- a/lib/files/node/nonexistingfile.php +++ b/lib/files/node/nonexistingfile.php @@ -8,12 +8,12 @@ namespace OC\Files\Node; -use OC\Files\NotFoundException; +use OCP\Files\NotFoundException; class NonExistingFile extends File { /** * @param string $newPath - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function rename($newPath) { throw new NotFoundException(); diff --git a/lib/files/node/nonexistingfolder.php b/lib/files/node/nonexistingfolder.php index 0249a026245..0346cbf1e21 100644 --- a/lib/files/node/nonexistingfolder.php +++ b/lib/files/node/nonexistingfolder.php @@ -8,12 +8,12 @@ namespace OC\Files\Node; -use OC\Files\NotFoundException; +use OCP\Files\NotFoundException; class NonExistingFolder extends Folder { /** * @param string $newPath - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function rename($newPath) { throw new NotFoundException(); diff --git a/lib/files/node/root.php b/lib/files/node/root.php index f88d8c294c7..e3d58476e9c 100644 --- a/lib/files/node/root.php +++ b/lib/files/node/root.php @@ -12,8 +12,8 @@ use OC\Files\Cache\Cache; use OC\Files\Cache\Scanner; use OC\Files\Mount\Manager; use OC\Files\Mount\Mount; -use OC\Files\NotFoundException; -use OC\Files\NotPermittedException; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; use OC\Hooks\Emitter; use OC\Hooks\PublicEmitter; @@ -21,18 +21,18 @@ use OC\Hooks\PublicEmitter; * Class Root * * Hooks available in scope \OC\Files - * - preWrite(\OC\Files\Node\Node $node) - * - postWrite(\OC\Files\Node\Node $node) - * - preCreate(\OC\Files\Node\Node $node) - * - postCreate(\OC\Files\Node\Node $node) - * - preDelete(\OC\Files\Node\Node $node) - * - postDelete(\OC\Files\Node\Node $node) - * - preTouch(\OC\Files\Node\Node $node, int $mtime) - * - postTouch(\OC\Files\Node\Node $node) - * - preCopy(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) - * - postCopy(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) - * - preRename(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) - * - postRename(\OC\Files\Node\Node $source, \OC\Files\Node\Node $target) + * - preWrite(\OCP\Files\Node $node) + * - postWrite(\OCP\Files\Node $node) + * - preCreate(\OCP\Files\Node $node) + * - postCreate(\OCP\Files\Node $node) + * - preDelete(\OCP\Files\Node $node) + * - postDelete(\OCP\Files\Node $node) + * - preTouch(\OC\FilesP\Node $node, int $mtime) + * - postTouch(\OCP\Files\Node $node) + * - preCopy(\OCP\Files\Node $source, \OCP\Files\Node $target) + * - postCopy(\OCP\Files\Node $source, \OCP\Files\Node $target) + * - preRename(\OCP\Files\Node $source, \OCP\Files\Node $target) + * - postRename(\OCP\Files\Node $source, \OCP\Files\Node $target) * * @package OC\Files\Node */ @@ -152,8 +152,8 @@ class Root extends Folder implements Emitter { /** * @param string $path - * @throws \OC\Files\NotFoundException - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotFoundException + * @throws \OCP\Files\NotPermittedException * @return Node */ public function get($path) { @@ -177,7 +177,7 @@ class Root extends Folder implements Emitter { * can exist in different places * * @param int $id - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException * @return Node[] */ public function getById($id) { @@ -200,7 +200,7 @@ class Root extends Folder implements Emitter { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function rename($targetPath) { @@ -213,7 +213,7 @@ class Root extends Folder implements Emitter { /** * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException * @return \OC\Files\Node\Node */ public function copy($targetPath) { @@ -222,7 +222,7 @@ class Root extends Folder implements Emitter { /** * @param int $mtime - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function touch($mtime = null) { throw new NotPermittedException(); @@ -230,7 +230,7 @@ class Root extends Folder implements Emitter { /** * @return \OC\Files\Storage\Storage - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function getStorage() { throw new NotFoundException(); @@ -322,7 +322,7 @@ class Root extends Folder implements Emitter { /** * @return Node - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function getParent() { throw new NotFoundException(); diff --git a/lib/public/files/alreadyexistsexception.php b/lib/public/files/alreadyexistsexception.php new file mode 100644 index 00000000000..32947c7a5c3 --- /dev/null +++ b/lib/public/files/alreadyexistsexception.php @@ -0,0 +1,11 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +class AlreadyExistsException extends \Exception {} diff --git a/lib/public/files/notenoughspaceexception.php b/lib/public/files/notenoughspaceexception.php new file mode 100644 index 00000000000..e51806666ad --- /dev/null +++ b/lib/public/files/notenoughspaceexception.php @@ -0,0 +1,11 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +class NotEnoughSpaceException extends \Exception {} diff --git a/lib/public/files/notfoundexception.php b/lib/public/files/notfoundexception.php new file mode 100644 index 00000000000..1ff426a40c6 --- /dev/null +++ b/lib/public/files/notfoundexception.php @@ -0,0 +1,11 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +class NotFoundException extends \Exception {} diff --git a/lib/public/files/notpermittedexception.php b/lib/public/files/notpermittedexception.php new file mode 100644 index 00000000000..0509de7e829 --- /dev/null +++ b/lib/public/files/notpermittedexception.php @@ -0,0 +1,11 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +class NotPermittedException extends \Exception {} -- cgit v1.2.3 From 9ad7891b4e7ddf1c4420f485c5d3cf4477835087 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Sep 2013 20:02:15 +0200 Subject: improve phpdoc for the public files interface --- lib/files/exceptions.php | 21 --------------- lib/public/files/file.php | 19 +++++++++---- lib/public/files/folder.php | 51 ++++++++++++++++++++++------------- lib/public/files/node.php | 65 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 105 insertions(+), 51 deletions(-) delete mode 100644 lib/files/exceptions.php (limited to 'lib') diff --git a/lib/files/exceptions.php b/lib/files/exceptions.php deleted file mode 100644 index 8a3c40ab0c0..00000000000 --- a/lib/files/exceptions.php +++ /dev/null @@ -1,21 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OC\Files; - -class NotFoundException extends \Exception { -} - -class NotPermittedException extends \Exception { -} - -class AlreadyExistsException extends \Exception { -} - -class NotEnoughSpaceException extends \Exception { -} diff --git a/lib/public/files/file.php b/lib/public/files/file.php index c571e184cee..916b2edd6c4 100644 --- a/lib/public/files/file.php +++ b/lib/public/files/file.php @@ -8,34 +8,43 @@ namespace OCP\Files; -use OC\Files\NotPermittedException; - interface File extends Node { /** + * Get the content of the file as string + * * @return string - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function getContent(); /** + * Write to the file from string data + * * @param string $data - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function putContent($data); /** + * Get the mimetype of the file + * * @return string */ public function getMimeType(); /** + * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen + * * @param string $mode * @return resource - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function fopen($mode); /** + * Compute the hash of the file + * Type of hash is set with $type and can be anything supported by php's hash_file + * * @param string $type * @param bool $raw * @return string diff --git a/lib/public/files/folder.php b/lib/public/files/folder.php index a8e57f7ae23..da7f20fd366 100644 --- a/lib/public/files/folder.php +++ b/lib/public/files/folder.php @@ -8,22 +8,21 @@ namespace OCP\Files; -use OC\Files\Cache\Cache; -use OC\Files\Cache\Scanner; -use OC\Files\NotFoundException; -use OC\Files\NotPermittedException; - interface Folder extends Node { /** - * @param string $path path relative to the folder + * Get the full path of an item in the folder within owncloud's filesystem + * + * @param string $path relative path of an item in the folder * @return string - * @throws \OC\Files\NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function getFullPath($path); /** - * @param string $path - * @throws \OC\Files\NotFoundException + * Get the path of an item in the folder relative to the folder + * + * @param string $path absolute path of an item in the folder + * @throws \OCP\Files\NotFoundException * @return string */ public function getRelativePath($path); @@ -39,7 +38,7 @@ interface Folder extends Node { /** * get the content of this directory * - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException * @return \OCP\Files\Node[] */ public function getDirectoryListing(); @@ -47,29 +46,35 @@ interface Folder extends Node { /** * Get the node at $path * - * @param string $path + * @param string $path relative path of the file or folder * @return \OCP\Files\Node - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function get($path); /** - * @param string $path + * Check if a file or folder exists in the folder + * + * @param string $path relative path of the file or folder * @return bool */ public function nodeExists($path); /** - * @param string $path + * Create a new folder + * + * @param string $path relative path of the new folder * @return \OCP\Files\Folder - * @throws NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function newFolder($path); /** - * @param string $path + * Create a new file + * + * @param string $path relative path of the new file * @return \OCP\Files\File - * @throws NotPermittedException + * @throws \OCP\Files\NotPermittedException */ public function newFile($path); @@ -83,6 +88,7 @@ interface Folder extends Node { /** * search for files by mimetype + * $mimetype can either be a full mimetype (image/png) or a wildcard mimetype (image) * * @param string $mimetype * @return \OCP\Files\Node[] @@ -90,14 +96,23 @@ interface Folder extends Node { public function searchByMime($mimetype); /** - * @param $id + * get a file or folder inside the folder by it's internal id + * + * @param int $id * @return \OCP\Files\Node[] */ public function getById($id); + /** + * Get the amount of free space inside the folder + * + * @return int + */ public function getFreeSpace(); /** + * Check if new files or folders can be created within the folder + * * @return bool */ public function isCreatable(); diff --git a/lib/public/files/node.php b/lib/public/files/node.php index d3b71803f50..42dd910871d 100644 --- a/lib/public/files/node.php +++ b/lib/public/files/node.php @@ -10,98 +10,149 @@ namespace OCP\Files; interface Node { /** - * @param string $targetPath - * @throws \OC\Files\NotPermittedException + * Move the file or folder to a new location + * + * @param string $targetPath the absolute target path + * @throws \OCP\Files\NotPermittedException * @return \OCP\Files\Node */ public function move($targetPath); + /** + * Delete the file or folder + */ public function delete(); /** - * @param string $targetPath + * Cope the file or folder to a new location + * + * @param string $targetPath the absolute target path * @return \OCP\Files\Node */ public function copy($targetPath); /** - * @param int $mtime - * @throws \OC\Files\NotPermittedException + * Change the modified date of the file or folder + * If $mtime is omitted the current time will be used + * + * @param int $mtime (optional) modified date as unix timestamp + * @throws \OCP\Files\NotPermittedException */ public function touch($mtime = null); /** + * Get the storage backend the file or folder is stored on + * * @return \OC\Files\Storage\Storage - * @throws \OC\Files\NotFoundException + * @throws \OCP\Files\NotFoundException */ public function getStorage(); /** + * Get the full path of the file or folder + * * @return string */ public function getPath(); /** + * Get the path of the file or folder relative to the mountpoint of it's storage + * * @return string */ public function getInternalPath(); /** + * Get the internal file id for the file or folder + * * @return int */ public function getId(); /** + * Get metadata of the file or folder + * The returned array contains the following values: + * - mtime + * - size + * * @return array */ public function stat(); /** + * Get the modified date of the file or folder as unix timestamp + * * @return int */ public function getMTime(); /** + * Get the size of the file or folder in bytes + * * @return int */ public function getSize(); /** + * Get the Etag of the file or folder + * The Etag is an string id used to detect changes to a file or folder, + * every time the file or folder is changed the Etag will change to + * * @return string */ public function getEtag(); + /** + * Get the permissions of the file or folder as a combination of one or more of the following constants: + * - \OCP\PERMISSION_READ + * - \OCP\PERMISSION_UPDATE + * - \OCP\PERMISSION_CREATE + * - \OCP\PERMISSION_DELETE + * - \OCP\PERMISSION_SHARE + * * @return int */ public function getPermissions(); /** + * Check if the file or folder is readable + * * @return bool */ public function isReadable(); /** + * Check if the file or folder is writable + * * @return bool */ public function isUpdateable(); /** + * Check if the file or folder is deletable + * * @return bool */ public function isDeletable(); /** + * Check if the file or folder is shareable + * * @return bool */ public function isShareable(); /** - * @return Node + * Get the parent folder of the file or folder + * + * @return Folder */ public function getParent(); /** + * Get the filename of the file or folder + * * @return string */ public function getName(); -- cgit v1.2.3 From 2e5ce091f037f0f1b2d5f97ad8866a82c9118f58 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Sep 2013 20:13:47 +0200 Subject: add storage backend interface to public namespace --- lib/files/storage/storage.php | 2 +- lib/public/files/node.php | 2 +- lib/public/files/storage.php | 343 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 345 insertions(+), 2 deletions(-) create mode 100644 lib/public/files/storage.php (limited to 'lib') diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php index c96caebf4af..b673bb9a32d 100644 --- a/lib/files/storage/storage.php +++ b/lib/files/storage/storage.php @@ -13,7 +13,7 @@ namespace OC\Files\Storage; * * All paths passed to the storage are relative to the storage and should NOT have a leading slash. */ -interface Storage { +interface Storage extends \OCP\Files\Storage { /** * $parameters is a free form array with the configuration options needed to construct the storage * diff --git a/lib/public/files/node.php b/lib/public/files/node.php index 42dd910871d..b3ddf6de621 100644 --- a/lib/public/files/node.php +++ b/lib/public/files/node.php @@ -43,7 +43,7 @@ interface Node { /** * Get the storage backend the file or folder is stored on * - * @return \OC\Files\Storage\Storage + * @return \OCP\Files\Storage * @throws \OCP\Files\NotFoundException */ public function getStorage(); diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php new file mode 100644 index 00000000000..e794662a434 --- /dev/null +++ b/lib/public/files/storage.php @@ -0,0 +1,343 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP\Files; + +/** + * Provide a common interface to all different storage options + * + * All paths passed to the storage are relative to the storage and should NOT have a leading slash. + */ +interface Storage { + /** + * $parameters is a free form array with the configuration options needed to construct the storage + * + * @param array $parameters + */ + public function __construct($parameters); + + /** + * Get the identifier for the storage, + * the returned id should be the same for every storage object that is created with the same parameters + * and two storage objects with the same id should refer to two storages that display the same files. + * + * @return string + */ + public function getId(); + + /** + * see http://php.net/manual/en/function.mkdir.php + * + * @param string $path + * @return bool + */ + public function mkdir($path); + + /** + * see http://php.net/manual/en/function.rmdir.php + * + * @param string $path + * @return bool + */ + public function rmdir($path); + + /** + * see http://php.net/manual/en/function.opendir.php + * + * @param string $path + * @return resource + */ + public function opendir($path); + + /** + * see http://php.net/manual/en/function.is_dir.php + * + * @param string $path + * @return bool + */ + public function is_dir($path); + + /** + * see http://php.net/manual/en/function.is_file.php + * + * @param string $path + * @return bool + */ + public function is_file($path); + + /** + * see http://php.net/manual/en/function.stat.php + * only the following keys are required in the result: size and mtime + * + * @param string $path + * @return array + */ + public function stat($path); + + /** + * see http://php.net/manual/en/function.filetype.php + * + * @param string $path + * @return bool + */ + public function filetype($path); + + /** + * see http://php.net/manual/en/function.filesize.php + * The result for filesize when called on a folder is required to be 0 + * + * @param string $path + * @return int + */ + public function filesize($path); + + /** + * check if a file can be created in $path + * + * @param string $path + * @return bool + */ + public function isCreatable($path); + + /** + * check if a file can be read + * + * @param string $path + * @return bool + */ + public function isReadable($path); + + /** + * check if a file can be written to + * + * @param string $path + * @return bool + */ + public function isUpdatable($path); + + /** + * check if a file can be deleted + * + * @param string $path + * @return bool + */ + public function isDeletable($path); + + /** + * check if a file can be shared + * + * @param string $path + * @return bool + */ + public function isSharable($path); + + /** + * get the full permissions of a path. + * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php + * + * @param string $path + * @return int + */ + public function getPermissions($path); + + /** + * see http://php.net/manual/en/function.file_exists.php + * + * @param string $path + * @return bool + */ + public function file_exists($path); + + /** + * see http://php.net/manual/en/function.filemtime.php + * + * @param string $path + * @return int + */ + public function filemtime($path); + + /** + * see http://php.net/manual/en/function.file_get_contents.php + * + * @param string $path + * @return string + */ + public function file_get_contents($path); + + /** + * see http://php.net/manual/en/function.file_put_contents.php + * + * @param string $path + * @param string $data + * @return bool + */ + public function file_put_contents($path, $data); + + /** + * see http://php.net/manual/en/function.unlink.php + * + * @param string $path + * @return bool + */ + public function unlink($path); + + /** + * see http://php.net/manual/en/function.rename.php + * + * @param string $path1 + * @param string $path2 + * @return bool + */ + public function rename($path1, $path2); + + /** + * see http://php.net/manual/en/function.copy.php + * + * @param string $path1 + * @param string $path2 + * @return bool + */ + public function copy($path1, $path2); + + /** + * see http://php.net/manual/en/function.fopen.php + * + * @param string $path + * @param string $mode + * @return resource + */ + public function fopen($path, $mode); + + /** + * get the mimetype for a file or folder + * The mimetype for a folder is required to be "httpd/unix-directory" + * + * @param string $path + * @return string + */ + public function getMimeType($path); + + /** + * see http://php.net/manual/en/function.hash-file.php + * + * @param string $type + * @param string $path + * @param bool $raw + * @return string + */ + public function hash($type, $path, $raw = false); + + /** + * see http://php.net/manual/en/function.free_space.php + * + * @param string $path + * @return int + */ + public function free_space($path); + + /** + * search for occurrences of $query in file names + * + * @param string $query + * @return array + */ + public function search($query); + + /** + * see http://php.net/manual/en/function.touch.php + * If the backend does not support the operation, false should be returned + * + * @param string $path + * @param int $mtime + * @return bool + */ + public function touch($path, $mtime = null); + + /** + * get the path to a local version of the file. + * The local version of the file can be temporary and doesn't have to be persistent across requests + * + * @param string $path + * @return string + */ + public function getLocalFile($path); + + /** + * get the path to a local version of the folder. + * The local version of the folder can be temporary and doesn't have to be persistent across requests + * + * @param string $path + * @return string + */ + public function getLocalFolder($path); + /** + * check if a file or folder has been updated since $time + * + * @param string $path + * @param int $time + * @return bool + * + * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed. + * returning true for other changes in the folder is optional + */ + public function hasUpdated($path, $time); + + /** + * get a cache instance for the storage + * + * @param string $path + * @return \OC\Files\Cache\Cache + */ + public function getCache($path = ''); + + /** + * get a scanner instance for the storage + * + * @param string $path + * @return \OC\Files\Cache\Scanner + */ + public function getScanner($path = ''); + + + /** + * get the user id of the owner of a file or folder + * + * @param string $path + * @return string + */ + public function getOwner($path); + + /** + * get a permissions cache instance for the cache + * + * @param string $path + * @return \OC\Files\Cache\Permissions + */ + public function getPermissionsCache($path = ''); + + /** + * get a watcher instance for the cache + * + * @param string $path + * @return \OC\Files\Cache\Watcher + */ + public function getWatcher($path = ''); + + /** + * @return \OC\Files\Cache\Storage + */ + public function getStorageCache(); + + /** + * get the ETag for a file or folder + * + * @param string $path + * @return string + */ + public function getETag($path); +} -- cgit v1.2.3 From af2164bbcb83eaac9534d9d5933d191687de548e Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 11 Sep 2013 01:23:37 +0200 Subject: no further comment - which dev did not test this BEFORE submitting the pull request? which reviewer did not test the pull request? --- lib/util.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 0777643a952..41f5f1d16be 100755 --- a/lib/util.php +++ b/lib/util.php @@ -689,8 +689,8 @@ class OC_Util { return false; } - $fp = @fopen($testfile, 'w'); - @fwrite($fp, $testcontent); + $fp = @fopen($testFile, 'w'); + @fwrite($fp, $testContent); @fclose($fp); // accessing the file via http @@ -700,7 +700,7 @@ class OC_Util { @fclose($fp); // cleanup - @unlink($testfile); + @unlink($testFile); // does it work ? if($content==$testContent) { -- cgit v1.2.3 From bf7f94422fc86558f71e11117caee0758266a163 Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 11 Sep 2013 07:11:33 +0200 Subject: Bring another enable_avatars to $_ and fix $thus->$this --- core/templates/layout.user.php | 2 +- lib/avatar.php | 2 +- lib/templatelayout.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index cd303104e0c..71bec11d219 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -49,7 +49,7 @@ - +
      diff --git a/lib/avatar.php b/lib/avatar.php index c07ef537d50..f20980c364b 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -28,7 +28,7 @@ class OC_Avatar { * @return boolean|\OC_Image containing the avatar or false if there's no image */ public function get ($size = 64) { - if ($thus->view->file_exists('avatar.jpg')) { + if ($this->view->file_exists('avatar.jpg')) { $ext = 'jpg'; } elseif ($this->view->file_exists('avatar.png')) { $ext = 'png'; diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0b868a39e49..625f3424a04 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template { $user_displayname = OC_User::getDisplayName(); $this->assign( 'user_displayname', $user_displayname ); $this->assign( 'user_uid', OC_User::getUser() ); + $this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); } else if ($renderas == 'guest' || $renderas == 'error') { parent::__construct('core', 'layout.guest'); } else { -- cgit v1.2.3 From 68015b276129e3ad5711e92c7b7d93887d72d30f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 11 Sep 2013 06:50:06 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ku_IQ.php | 1 + apps/files_sharing/l10n/es_AR.php | 6 ++++ apps/user_ldap/l10n/es_AR.php | 9 +++++ core/l10n/es_AR.php | 17 ++++++--- core/l10n/ku_IQ.php | 1 + l10n/es_AR/core.po | 40 ++++++++++----------- l10n/es_AR/files_sharing.po | 18 +++++----- l10n/es_AR/lib.po | 70 ++++++++++++++++++------------------- l10n/es_AR/user_ldap.po | 24 ++++++------- l10n/ku_IQ/core.po | 6 ++-- l10n/ku_IQ/files.po | 52 +++++++++++++-------------- l10n/ku_IQ/lib.po | 24 ++++++------- l10n/ro/files.po | 4 +-- 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_trashbin.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/es_AR.php | 22 +++++++++--- 25 files changed, 178 insertions(+), 138 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php index 9ec565da441..d98848a71f0 100644 --- a/apps/files/l10n/ku_IQ.php +++ b/apps/files/l10n/ku_IQ.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.", "Error" => "هه‌ڵه", +"Share" => "هاوبەشی کردن", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php index fed0b1e7b30..7c9dcb94ac1 100644 --- a/apps/files_sharing/l10n/es_AR.php +++ b/apps/files_sharing/l10n/es_AR.php @@ -3,6 +3,12 @@ $TRANSLATIONS = array( "The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", +"Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.", +"Reasons might be:" => "Las causas podrían ser:", +"the item was removed" => "el elemento fue borrado", +"the link expired" => "el enlace expiró", +"sharing is disabled" => "compartir está desactivado", +"For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.", "%s shared the folder %s with you" => "%s compartió la carpeta %s con vos", "%s shared the file %s with you" => "%s compartió el archivo %s con vos", "Download" => "Descargar", diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index ecfcae32f46..b31f41e3dfb 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "Falló es test de conexión", "Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?", "Confirm Deletion" => "Confirmar borrado", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Atención: El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.", "Server configuration" => "Configuración del Servidor", "Add Server Configuration" => "Añadir Configuración del Servidor", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Contraseña", "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.", "User Login Filter" => "Filtro de inicio de sesión de usuario", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"", "User List Filter" => "Lista de filtros de usuario", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\"", "Group Filter" => "Filtro de grupo", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"", "Connection Settings" => "Configuración de Conección", "Configuration Active" => "Configuración activa", "When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.", "Backup (Replica) Port" => "Puerto para copia de seguridad (réplica)", "Disable Main Server" => "Deshabilitar el Servidor Principal", +"Only connect to the replica server." => "Conectarse únicamente al servidor de réplica.", "Use TLS" => "Usar TLS", "Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarán", "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Tiempo de vida del caché", "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.", "Directory Settings" => "Configuración de Directorio", "User Display Name Field" => "Campo de nombre de usuario a mostrar", +"The LDAP attribute to use to generate the user's display name." => "El atributo LDAP a usar para generar el nombre de usuario mostrado.", "Base User Tree" => "Árbol base de usuario", "One User Base DN per line" => "Una DN base de usuario por línea", "User Search Attributes" => "Atributos de la búsqueda de usuario", "Optional; one attribute per line" => "Opcional; un atributo por linea", "Group Display Name Field" => "Campo de nombre de grupo a mostrar", +"The LDAP attribute to use to generate the groups's display name." => "El atributo LDAP a usar para generar el nombre de grupo mostrado.", "Base Group Tree" => "Árbol base de grupo", "One Group Base DN per line" => "Una DN base de grupo por línea", "Group Search Attributes" => "Atributos de búsqueda de grupo", @@ -64,6 +72,7 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.", "Internal Username" => "Nombre interno de usuario", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).", "Internal Username Attribute:" => "Atributo Nombre Interno de usuario:", "Override UUID detection" => "Sobrescribir la detección UUID", "UUID Attribute:" => "Atributo UUID:", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 389251de8aa..953a30c01d5 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartió \"%s\" con vos", "group" => "grupo", +"Turned on maintenance mode" => "Modo de mantenimiento activado", +"Turned off maintenance mode" => "Modo de mantenimiento desactivado", +"Updated database" => "Base de datos actualizada", +"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...", +"Updated filecache" => "Caché de archivos actualizada", +"... %d%% done ..." => "... %d%% hecho ...", "Category type not provided." => "Tipo de categoría no provisto. ", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "diciembre", "Settings" => "Configuración", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "months ago" => "meses atrás", "last year" => "el año pasado", "years ago" => "años atrás", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "e-mail mandado", "The update was unsuccessful. Please report this issue to the ownCloud community." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", +"%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail.
      Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado.
      Si no está ahí, preguntale a tu administrador.", "Request failed!
      Did you make sure your email/username was right?" => "¡Error en el pedido!
      ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?", @@ -108,9 +115,11 @@ $TRANSLATIONS = array( "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.", +"For information how to properly configure your server, please see the documentation." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la documentación.", "Create an admin account" => "Crear una cuenta de administrador", "Advanced" => "Avanzado", "Data folder" => "Directorio de almacenamiento", diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php index a2a0ff22ef6..5ce6ce9c821 100644 --- a/core/l10n/ku_IQ.php +++ b/core/l10n/ku_IQ.php @@ -6,6 +6,7 @@ $TRANSLATIONS = array( "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), "Error" => "هه‌ڵه", +"Share" => "هاوبەشی کردن", "Password" => "وشەی تێپەربو", "Username" => "ناوی به‌کارهێنه‌ر", "New password" => "وشەی نهێنی نوێ", diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index be8c46730fc..8704e5edd73 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-11 10:30+0000\n" +"Last-Translator: cjtess \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" @@ -29,28 +29,28 @@ msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Modo de mantenimiento activado" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Modo de mantenimiento desactivado" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de datos actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualizando caché de archivos, esto puede tardar mucho tiempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Caché de archivos actualizada" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% hecho ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -178,14 +178,14 @@ msgstr "segundos atrás" #: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n minuto" +msgstr[1] "Hace %n minutos" #: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n hora" +msgstr[1] "Hace %n horas" #: js/js.js:824 msgid "today" @@ -198,8 +198,8 @@ msgstr "ayer" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n día" +msgstr[1] "Hace %n días" #: js/js.js:827 msgid "last month" @@ -208,8 +208,8 @@ msgstr "el mes pasado" #: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n mes" +msgstr[1] "Hace %n meses" #: js/js.js:829 msgid "months ago" @@ -406,7 +406,7 @@ msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud." #: lostpassword/controller.php:62 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s restablecer contraseña" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -523,7 +523,7 @@ msgstr "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura." #: templates/installation.php:32 msgid "" @@ -548,7 +548,7 @@ msgstr "Tu directorio de datos y tus archivos probablemente son accesibles a tra msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la documentación." #: templates/installation.php:47 msgid "Create an admin account" diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index 9bdc2244b46..376086d3b93 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/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: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-11 10:30+0000\n" +"Last-Translator: cjtess \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" @@ -32,27 +32,27 @@ msgstr "Enviar" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Perdón, este enlace parece no funcionar más." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Las causas podrían ser:" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "el elemento fue borrado" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "el enlace expiró" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "compartir está desactivado" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Para mayor información, contactá a la persona que te mandó el enlace." #: templates/public.php:15 #, php-format diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po index 1ae0a4d355b..9666bf99a50 100644 --- a/l10n/es_AR/lib.po +++ b/l10n/es_AR/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-11 10:30+0000\n" +"Last-Translator: cjtess \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" @@ -23,11 +23,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud" #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "No fue especificado el nombre de la app" #: app.php:361 msgid "Help" @@ -87,59 +87,59 @@ msgstr "Descargá los archivos en partes más chicas, de forma separada, o pedí #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "No se especificó el origen al instalar la app" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "No se especificó href al instalar la app" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "No se especificó PATH al instalar la app desde el archivo local" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "No hay soporte para archivos de tipo %s" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Error al abrir archivo mientras se instalaba la app" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "La app no suministra un archivo info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "No puede ser instalada la app por tener código no autorizado" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "No se puede instalar la app porque no es compatible con esta versión de ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "La app no se puede instalar porque contiene la etiqueta true que no está permitida para apps no distribuidas" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "El directorio de la app ya existe" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "No se puede crear el directorio para la app. Corregí los permisos. %s" #: json.php:28 msgid "Application is not enabled" @@ -265,51 +265,51 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci msgid "Please double check the installation guides." msgstr "Por favor, comprobá nuevamente la guía de instalación." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "segundos atrás" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n minuto" +msgstr[1] "Hace %n minutos" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n hora" +msgstr[1] "Hace %n horas" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "hoy" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "ayer" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n día" +msgstr[1] "Hace %n días" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "el mes pasado" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n mes" +msgstr[1] "Hace %n meses" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "el año pasado" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "años atrás" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index e260f9f562c..8d69c7a8a99 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-11 10:48+0000\n" +"Last-Translator: cjtess \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" @@ -91,7 +91,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos." #: templates/settings.php:12 msgid "" @@ -156,7 +156,7 @@ msgstr "Filtro de inicio de sesión de usuario" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -166,7 +166,7 @@ msgstr "Lista de filtros de usuario" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -176,7 +176,7 @@ msgstr "Filtro de grupo" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -214,7 +214,7 @@ msgstr "Deshabilitar el Servidor Principal" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Conectarse únicamente al servidor de réplica." #: templates/settings.php:73 msgid "Use TLS" @@ -237,7 +237,7 @@ msgstr "Desactivar la validación por certificado SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -257,7 +257,7 @@ msgstr "Campo de nombre de usuario a mostrar" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "El atributo LDAP a usar para generar el nombre de usuario mostrado." #: templates/settings.php:81 msgid "Base User Tree" @@ -281,7 +281,7 @@ msgstr "Campo de nombre de grupo a mostrar" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "El atributo LDAP a usar para generar el nombre de grupo mostrado." #: templates/settings.php:84 msgid "Base Group Tree" @@ -347,7 +347,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados)." #: templates/settings.php:100 msgid "Internal Username Attribute:" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index 65ffe9e63c8..67b38108337 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-10 18:00+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" @@ -269,7 +269,7 @@ msgstr "" #: js/share.js:90 msgid "Share" -msgstr "" +msgstr "هاوبەشی کردن" #: js/share.js:131 js/share.js:683 msgid "Error while sharing" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index b209e07c6f9..65a43a82d90 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-11 06:47-0400\n" +"PO-Revision-Date: 2013-09-10 18:00+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" @@ -111,13 +111,13 @@ msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "هه‌ڵه" #: js/fileactions.js:116 msgid "Share" -msgstr "" +msgstr "هاوبەشی کردن" #: js/fileactions.js:126 msgid "Delete permanently" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "ناو" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "داگرتن" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po index 06a8f2c010f..d569a0a599f 100644 --- a/l10n/ku_IQ/lib.po +++ b/l10n/ku_IQ/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"PO-Revision-Date: 2013-09-10 16:40+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" @@ -264,51 +264,51 @@ msgstr "" msgid "Please double check the installation guides." msgstr "" -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 1d6755cb53e..009d23f4d8b 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-10 14:41+0000\n" +"POT-Creation-Date: 2013-09-11 06:47-0400\n" +"PO-Revision-Date: 2013-09-10 14:50+0000\n" "Last-Translator: inaina \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 44fea90143b..d5b1ea189bf 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 9696122a837..6fae04c74e9 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:47-0400\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 9e43dd73aff..5eca0032ab1 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:47-0400\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 b6a76cb00fc..a369531068c 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:47-0400\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 1ff57c35ad2..7c4c4ece848 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 8e4e83df745..2ac258974d0 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 a88051bb451..c7e4db14518 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 dd7d5cd1bd9..ccc2744b837 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 cdb551ec943..0aa498898ee 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 9024b177c38..e9e02a20cdf 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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 8fc98e5791f..9ba2922286c 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" +"POT-Creation-Date: 2013-09-11 06:48-0400\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/es_AR.php b/lib/l10n/es_AR.php index 26f1e4ecd5e..f637eb403ed 100644 --- a/lib/l10n/es_AR.php +++ b/lib/l10n/es_AR.php @@ -1,5 +1,7 @@ "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud", +"No app name specified" => "No fue especificado el nombre de la app", "Help" => "Ayuda", "Personal" => "Personal", "Settings" => "Configuración", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Volver a Archivos", "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador", +"No source specified when installing app" => "No se especificó el origen al instalar la app", +"No href specified when installing app from http" => "No se especificó href al instalar la app", +"No path specified when installing app from local file" => "No se especificó PATH al instalar la app desde el archivo local", +"Archives of type %s are not supported" => "No hay soporte para archivos de tipo %s", +"Failed to open archive when installing app" => "Error al abrir archivo mientras se instalaba la app", +"App does not provide an info.xml file" => "La app no suministra un archivo info.xml", +"App can't be installed because of not allowed code in the App" => "No puede ser instalada la app por tener código no autorizado", +"App can't be installed because it is not compatible with this version of ownCloud" => "No se puede instalar la app porque no es compatible con esta versión de ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "La app no se puede instalar porque contiene la etiqueta true que no está permitida para apps no distribuidas", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store", +"App directory already exists" => "El directorio de la app ya existe", +"Can't create app folder. Please fix permissions. %s" => "No se puede crear el directorio para la app. Corregí los permisos. %s", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error al autenticar", "Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.", @@ -40,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.", "Please double check the installation guides." => "Por favor, comprobá nuevamente la guía de instalación.", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "el año pasado", "years ago" => "años atrás", "Caused by:" => "Provocado por:", -- cgit v1.2.3 From 8543951cf9f4ec9e3c7cec998fada90c628bce76 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 12 Sep 2013 00:12:20 +0200 Subject: adding icons for shared folders and external folders --- lib/helper.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index 5fb8fed3459..1f1ce8451c0 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -232,6 +232,14 @@ class OC_Helper { self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder.png'; return OC::$WEBROOT . '/core/img/filetypes/folder.png'; } + if ($mimetype === 'dir-shared') { + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-shared.png'; + return OC::$WEBROOT . '/core/img/filetypes/folder-shared.png'; + } + if ($mimetype === 'dir-external') { + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-external.png'; + return OC::$WEBROOT . '/core/img/filetypes/folder-external.png'; + } // Icon exists? if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $icon . '.png')) { -- cgit v1.2.3 From 58ed78aa9eb3c6b7986c7eb84668bdb5e65c0b13 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 12 Sep 2013 21:58:32 +0200 Subject: cleanup public storage interface a bit --- lib/public/files/storage.php | 46 -------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'lib') diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php index e794662a434..f32f2073483 100644 --- a/lib/public/files/storage.php +++ b/lib/public/files/storage.php @@ -287,52 +287,6 @@ interface Storage { */ public function hasUpdated($path, $time); - /** - * get a cache instance for the storage - * - * @param string $path - * @return \OC\Files\Cache\Cache - */ - public function getCache($path = ''); - - /** - * get a scanner instance for the storage - * - * @param string $path - * @return \OC\Files\Cache\Scanner - */ - public function getScanner($path = ''); - - - /** - * get the user id of the owner of a file or folder - * - * @param string $path - * @return string - */ - public function getOwner($path); - - /** - * get a permissions cache instance for the cache - * - * @param string $path - * @return \OC\Files\Cache\Permissions - */ - public function getPermissionsCache($path = ''); - - /** - * get a watcher instance for the cache - * - * @param string $path - * @return \OC\Files\Cache\Watcher - */ - public function getWatcher($path = ''); - - /** - * @return \OC\Files\Cache\Storage - */ - public function getStorageCache(); - /** * get the ETag for a file or folder * -- cgit v1.2.3 From 7f07d737f85fcf511219f44d5369b352b9f0e067 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 10 Sep 2013 19:14:30 +0200 Subject: Create instance of Doctrine\Common\EventManager() in OC_DB. --- lib/db.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/db.php b/lib/db.php index f090f474243..bd67937cdd8 100644 --- a/lib/db.php +++ b/lib/db.php @@ -75,6 +75,7 @@ class OC_DB { // do nothing if the connection already has been established if (!self::$connection) { $config = new \Doctrine\DBAL\Configuration(); + $eventManager = new \Doctrine\Common\EventManager(); switch($type) { case 'sqlite': case 'sqlite3': @@ -142,7 +143,7 @@ class OC_DB { $connectionParams['wrapperClass'] = 'OC\DB\Connection'; $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' ); try { - self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); + self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager); if ($type === 'sqlite' || $type === 'sqlite3') { // Sqlite doesn't handle query caching and schema changes // TODO: find a better way to handle this -- cgit v1.2.3 From 786017c2472067997239f7b225ed22fd24cab264 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 10 Sep 2013 19:15:06 +0200 Subject: Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. --- lib/db.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/db.php b/lib/db.php index bd67937cdd8..b9505b88d82 100644 --- a/lib/db.php +++ b/lib/db.php @@ -124,6 +124,7 @@ class OC_DB { $connectionParams['port'] = $port; } $connectionParams['adapter'] = '\OC\DB\AdapterOCI8'; + $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit); break; case 'mssql': $connectionParams = array( -- cgit v1.2.3 From 8c9add4d3292659228b3d0cf009a7945f09f2705 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 13 Sep 2013 17:22:45 +0200 Subject: adding TB and GB to OC_Helper::humanFileSize --- lib/helper.php | 11 ++++++++-- tests/lib/helper.php | 62 +++++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 32 deletions(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index 29660b9e1f1..5b9b961756c 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -296,10 +296,17 @@ class OC_Helper { if ($bytes < 1024) { return "$bytes MB"; } + $bytes = round($bytes / 1024, 1); + if ($bytes < 1024) { + return "$bytes GB"; + } + $bytes = round($bytes / 1024, 1); + if ($bytes < 1024) { + return "$bytes TB"; + } - // Wow, heavy duty for owncloud $bytes = round($bytes / 1024, 1); - return "$bytes GB"; + return "$bytes PB"; } /** diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 67b5a3d43ec..b4d896e5196 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -8,40 +8,42 @@ class Test_Helper extends PHPUnit_Framework_TestCase { - function testHumanFileSize() { - $result = OC_Helper::humanFileSize(0); - $expected = '0 B'; - $this->assertEquals($result, $expected); - - $result = OC_Helper::humanFileSize(1024); - $expected = '1 kB'; - $this->assertEquals($result, $expected); - - $result = OC_Helper::humanFileSize(10000000); - $expected = '9.5 MB'; - $this->assertEquals($result, $expected); - - $result = OC_Helper::humanFileSize(500000000000); - $expected = '465.7 GB'; - $this->assertEquals($result, $expected); + /** + * @dataProvider humanFileSizeProvider + */ + public function testHumanFileSize($expected, $input) + { + $result = OC_Helper::humanFileSize($input); + $this->assertEquals($expected, $result); } - function testComputerFileSize() { - $result = OC_Helper::computerFileSize("0 B"); - $expected = '0.0'; - $this->assertEquals($result, $expected); - - $result = OC_Helper::computerFileSize("1 kB"); - $expected = '1024.0'; - $this->assertEquals($result, $expected); + public function humanFileSizeProvider() + { + return array( + array('0 B', 0), + array('1 kB', 1024), + array('9.5 MB', 10000000), + array('465.7 GB', 500000000000), + array('454.7 TB', 500000000000000), + array('444.1 PB', 500000000000000000), + ); + } - $result = OC_Helper::computerFileSize("9.5 MB"); - $expected = '9961472.0'; - $this->assertEquals($result, $expected); + /** + * @dataProvider computerFileSizeProvider + */ + function testComputerFileSize($expected, $input) { + $result = OC_Helper::computerFileSize($input); + $this->assertEquals($expected, $result); + } - $result = OC_Helper::computerFileSize("465.7 GB"); - $expected = '500041567436.8'; - $this->assertEquals($result, $expected); + function computerFileSizeProvider(){ + return array( + array(0.0, "0 B"), + array(1024.0, "1 kB"), + array(9961472.0, "9.5 MB"), + array(500041567436.8, "465.7 GB"), + ); } function testGetMimeType() { -- cgit v1.2.3 From 049e57ac4aff9691bd74777749a5edfa5e26c0ec Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 13 Sep 2013 17:41:09 +0200 Subject: remove unused OC_L10N --- lib/helper.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index 5b9b961756c..66e7acb407a 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -282,7 +282,6 @@ class OC_Helper { */ public static function humanFileSize($bytes) { if ($bytes < 0) { - $l = OC_L10N::get('lib'); return "?"; } if ($bytes < 1024) { -- cgit v1.2.3 From 556bd1ef23ca6176018a48e72f1e330269a69aab Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 13 Sep 2013 21:49:24 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/lt_LT.php | 11 +- apps/files_encryption/l10n/lt_LT.php | 24 +- apps/files_sharing/l10n/lt_LT.php | 7 + apps/files_trashbin/l10n/lt_LT.php | 5 +- apps/files_versions/l10n/lt_LT.php | 3 + apps/user_ldap/l10n/es_AR.php | 2 + apps/user_ldap/l10n/lt_LT.php | 1 + apps/user_webdavauth/l10n/lt_LT.php | 4 +- core/l10n/km.php | 8 + core/l10n/lt_LT.php | 14 +- core/l10n/pt_PT.php | 3 + l10n/ar/files.po | 4 +- l10n/ar/files_sharing.po | 4 +- l10n/bg_BG/files.po | 4 +- l10n/bg_BG/files_sharing.po | 4 +- l10n/bn_BD/files.po | 50 +-- l10n/bn_BD/files_sharing.po | 4 +- l10n/ca/files.po | 4 +- l10n/ca/files_sharing.po | 4 +- l10n/cs_CZ/files.po | 4 +- l10n/cs_CZ/files_sharing.po | 4 +- l10n/cy_GB/files.po | 4 +- l10n/cy_GB/files_sharing.po | 4 +- l10n/da/files.po | 4 +- l10n/da/files_sharing.po | 4 +- l10n/de/files.po | 4 +- l10n/de/files_sharing.po | 4 +- l10n/de_CH/files.po | 4 +- l10n/de_CH/files_sharing.po | 4 +- l10n/de_DE/files.po | 4 +- l10n/de_DE/files_sharing.po | 4 +- l10n/el/files.po | 4 +- l10n/el/files_sharing.po | 4 +- l10n/en_GB/files.po | 4 +- l10n/en_GB/files_sharing.po | 4 +- l10n/eo/files.po | 4 +- l10n/eo/files_sharing.po | 4 +- l10n/es/files.po | 4 +- l10n/es/files_sharing.po | 4 +- l10n/es_AR/files.po | 4 +- l10n/es_AR/files_sharing.po | 4 +- l10n/es_AR/user_ldap.po | 8 +- l10n/et_EE/files.po | 4 +- l10n/et_EE/files_sharing.po | 4 +- l10n/eu/files.po | 4 +- l10n/eu/files_sharing.po | 4 +- l10n/fa/files.po | 4 +- l10n/fa/files_sharing.po | 4 +- l10n/fi_FI/files.po | 4 +- l10n/fi_FI/files_sharing.po | 4 +- l10n/fr/files.po | 4 +- l10n/fr/files_sharing.po | 4 +- l10n/gl/files.po | 4 +- l10n/gl/files_sharing.po | 4 +- l10n/he/files.po | 4 +- l10n/he/files_sharing.po | 4 +- l10n/hr/files.po | 50 +-- l10n/hr/files_sharing.po | 4 +- l10n/hu_HU/files.po | 4 +- l10n/hu_HU/files_sharing.po | 4 +- l10n/ia/files.po | 50 +-- l10n/ia/files_sharing.po | 4 +- l10n/id/files.po | 50 +-- l10n/id/files_sharing.po | 4 +- l10n/is/files.po | 50 +-- l10n/is/files_sharing.po | 4 +- l10n/it/files.po | 4 +- l10n/it/files_sharing.po | 4 +- l10n/ja_JP/files.po | 4 +- l10n/ja_JP/files_sharing.po | 4 +- l10n/ka_GE/files.po | 4 +- l10n/ka_GE/files_sharing.po | 4 +- l10n/km/core.po | 643 +++++++++++++++++++++++++++++++++++ l10n/km/files.po | 332 ++++++++++++++++++ l10n/km/files_encryption.po | 176 ++++++++++ l10n/km/files_external.po | 123 +++++++ l10n/km/files_sharing.po | 80 +++++ l10n/km/files_trashbin.po | 82 +++++ l10n/km/files_versions.po | 43 +++ l10n/km/lib.po | 318 +++++++++++++++++ l10n/km/settings.po | 540 +++++++++++++++++++++++++++++ l10n/km/user_ldap.po | 406 ++++++++++++++++++++++ l10n/km/user_webdavauth.po | 33 ++ l10n/ko/files.po | 4 +- l10n/ko/files_sharing.po | 4 +- l10n/ku_IQ/files.po | 4 +- l10n/ku_IQ/files_sharing.po | 4 +- l10n/lb/files.po | 50 +-- l10n/lb/files_sharing.po | 4 +- l10n/lt_LT/core.po | 37 +- l10n/lt_LT/files.po | 35 +- l10n/lt_LT/files_encryption.po | 59 ++-- l10n/lt_LT/files_sharing.po | 21 +- l10n/lt_LT/files_trashbin.po | 31 +- l10n/lt_LT/files_versions.po | 15 +- l10n/lt_LT/lib.po | 146 ++++---- l10n/lt_LT/settings.po | 105 +++--- l10n/lt_LT/user_ldap.po | 6 +- l10n/lt_LT/user_webdavauth.po | 13 +- l10n/lv/files.po | 4 +- l10n/lv/files_sharing.po | 4 +- l10n/mk/files.po | 50 +-- l10n/mk/files_sharing.po | 4 +- l10n/ms_MY/files.po | 50 +-- l10n/ms_MY/files_sharing.po | 4 +- l10n/nb_NO/files.po | 4 +- l10n/nb_NO/files_sharing.po | 4 +- l10n/nl/files.po | 4 +- l10n/nl/files_sharing.po | 4 +- l10n/nn_NO/files.po | 4 +- l10n/nn_NO/files_sharing.po | 4 +- l10n/oc/files.po | 50 +-- l10n/oc/files_sharing.po | 4 +- l10n/pl/files.po | 4 +- l10n/pl/files_sharing.po | 4 +- l10n/pt_BR/files.po | 4 +- l10n/pt_BR/files_sharing.po | 4 +- l10n/pt_PT/core.po | 10 +- l10n/pt_PT/files.po | 4 +- l10n/pt_PT/files_sharing.po | 4 +- l10n/ro/files.po | 4 +- l10n/ro/files_sharing.po | 4 +- l10n/ru/files.po | 4 +- l10n/ru/files_sharing.po | 4 +- l10n/si_LK/files.po | 4 +- l10n/si_LK/files_sharing.po | 4 +- l10n/sk_SK/files.po | 4 +- l10n/sk_SK/files_sharing.po | 4 +- l10n/sl/files.po | 4 +- l10n/sl/files_sharing.po | 4 +- l10n/sq/files.po | 4 +- l10n/sq/files_sharing.po | 4 +- l10n/sr/files.po | 4 +- l10n/sr/files_sharing.po | 4 +- l10n/sr@latin/files.po | 50 +-- l10n/sr@latin/files_sharing.po | 4 +- l10n/sv/files.po | 4 +- l10n/sv/files_sharing.po | 4 +- l10n/ta_LK/files.po | 4 +- l10n/ta_LK/files_sharing.po | 4 +- 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_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 18 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/files.po | 4 +- l10n/th_TH/files_sharing.po | 4 +- l10n/tr/files.po | 4 +- l10n/tr/files_sharing.po | 4 +- l10n/ug/files.po | 50 +-- l10n/ug/files_sharing.po | 4 +- l10n/uk/files.po | 4 +- l10n/uk/files_sharing.po | 4 +- l10n/vi/files.po | 4 +- l10n/vi/files_sharing.po | 4 +- l10n/zh_CN/files.po | 4 +- l10n/zh_CN/files_sharing.po | 4 +- l10n/zh_HK/files.po | 50 +-- l10n/zh_HK/files_sharing.po | 4 +- l10n/zh_TW/files.po | 4 +- l10n/zh_TW/files_sharing.po | 4 +- lib/l10n/km.php | 8 + lib/l10n/lt_LT.php | 49 ++- settings/l10n/lt_LT.php | 48 +++ 170 files changed, 3738 insertions(+), 789 deletions(-) create mode 100644 core/l10n/km.php create mode 100644 l10n/km/core.po create mode 100644 l10n/km/files.po create mode 100644 l10n/km/files_encryption.po create mode 100644 l10n/km/files_external.po create mode 100644 l10n/km/files_sharing.po create mode 100644 l10n/km/files_trashbin.po create mode 100644 l10n/km/files_versions.po create mode 100644 l10n/km/lib.po create mode 100644 l10n/km/settings.po create mode 100644 l10n/km/user_ldap.po create mode 100644 l10n/km/user_webdavauth.po create mode 100644 lib/l10n/km.php (limited to 'lib') diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 0530adc2ae2..83ed8e8688f 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja", "Could not move %s" => "Nepavyko perkelti %s", +"Unable to set upload directory." => "Nepavyksta nustatyti įkėlimų katalogo.", +"Invalid Token" => "Netinkamas ženklas", "No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties", "There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:", @@ -31,19 +33,22 @@ $TRANSLATIONS = array( "cancel" => "atšaukti", "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}", "undo" => "anuliuoti", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), -"_Uploading %n file_::_Uploading %n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"), +"_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"), +"{dirs} and {files}" => "{dirs} ir {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"), "files uploading" => "įkeliami failai", "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", "File name cannot be empty." => "Failo pavadinimas negali būti tuščias.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.", "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta", "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.", "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.", "Name" => "Pavadinimas", "Size" => "Dydis", "Modified" => "Pakeista", +"%s could not be renamed" => "%s negali būti pervadintas", "Upload" => "Įkelti", "File handling" => "Failų tvarkymas", "Maximum upload size" => "Maksimalus įkeliamo failo dydis", diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php index 9fbf7b29604..4ededb716f4 100644 --- a/apps/files_encryption/l10n/lt_LT.php +++ b/apps/files_encryption/l10n/lt_LT.php @@ -6,12 +6,34 @@ $TRANSLATIONS = array( "Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!", "Password successfully changed." => "Slaptažodis sėkmingai pakeistas", "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.", +"Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.", +"Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.", +"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.", +"Missing requirements." => "Trūkstami laukai.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.", +"Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:", "Saving..." => "Saugoma...", +"Your private key is not valid! Maybe the your password was changed from outside." => "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?", +"You can unlock your private key in your " => "Galite atrakinti savo privatų raktą savo", +"personal settings" => "asmeniniai nustatymai", "Encryption" => "Šifravimas", +"Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):", +"Recovery key password" => "Atkūrimo rakto slaptažodis", "Enabled" => "Įjungta", "Disabled" => "Išjungta", +"Change recovery key password:" => "Pakeisti atkūrimo rakto slaptažodį:", +"Old Recovery key password" => "Senas atkūrimo rakto slaptažodis", +"New Recovery key password" => "Naujas atkūrimo rakto slaptažodis", "Change Password" => "Pakeisti slaptažodį", -"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti", +"Your private key password no longer match your log-in password:" => "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:", +"Set your old private key password to your current log-in password." => "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo.", +" If you don't remember your old password you can ask your administrator to recover your files." => "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.", +"Old log-in password" => "Senas prisijungimo slaptažodis", +"Current log-in password" => "Dabartinis prisijungimo slaptažodis", +"Update Private Key Password" => "Atnaujinti privataus rakto slaptažodį", +"Enable password recovery:" => "Įjungti slaptažodžio atkūrimą:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.", +"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti", "Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php index 5d0e58e2fb2..90ae6a39a07 100644 --- a/apps/files_sharing/l10n/lt_LT.php +++ b/apps/files_sharing/l10n/lt_LT.php @@ -1,7 +1,14 @@ "Netinka slaptažodis: Bandykite dar kartą.", "Password" => "Slaptažodis", "Submit" => "Išsaugoti", +"Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.", +"Reasons might be:" => "Galimos priežastys:", +"the item was removed" => "elementas buvo pašalintas", +"the link expired" => "baigėsi nuorodos galiojimo laikas", +"sharing is disabled" => "dalinimasis yra išjungtas", +"For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.", "%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku", "%s shared the file %s with you" => "%s pasidalino su jumis %s failu", "Download" => "Atsisiųsti", diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php index c4a12ff2175..0a51290f4d9 100644 --- a/apps/files_trashbin/l10n/lt_LT.php +++ b/apps/files_trashbin/l10n/lt_LT.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Ištrinti negrįžtamai", "Name" => "Pavadinimas", "Deleted" => "Ištrinti", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("","","%n aplankų"), +"_%n file_::_%n files_" => array("","","%n failų"), +"restored" => "atstatyta", "Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!", "Restore" => "Atstatyti", "Delete" => "Ištrinti", diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php index 4e1af5fcc29..3afcfbe3b5f 100644 --- a/apps/files_versions/l10n/lt_LT.php +++ b/apps/files_versions/l10n/lt_LT.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "Nepavyko atstatyti: %s", "Versions" => "Versijos", +"Failed to revert {file} to revision {timestamp}." => "Nepavyko atstatyti {file} į būseną {timestamp}.", +"More versions..." => "Daugiau versijų...", +"No other versions available" => "Nėra daugiau versijų", "Restore" => "Atstatyti" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index b31f41e3dfb..2436df8de77 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -75,8 +75,10 @@ $TRANSLATIONS = array( "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).", "Internal Username Attribute:" => "Atributo Nombre Interno de usuario:", "Override UUID detection" => "Sobrescribir la detección UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).", "UUID Attribute:" => "Atributo UUID:", "Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.", "Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP", "Test Configuration" => "Probar configuración", diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php index 7e8b389af7f..2c3b938fcfe 100644 --- a/apps/user_ldap/l10n/lt_LT.php +++ b/apps/user_ldap/l10n/lt_LT.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "Deletion failed" => "Ištrinti nepavyko", "Error" => "Klaida", +"Host" => "Mazgas", "Password" => "Slaptažodis", "Group Filter" => "Grupės filtras", "Port" => "Prievadas", diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php index 90fc2d5ac3e..41a7fa9502d 100644 --- a/apps/user_webdavauth/l10n/lt_LT.php +++ b/apps/user_webdavauth/l10n/lt_LT.php @@ -1,5 +1,7 @@ "WebDAV autorizavimas" +"WebDAV Authentication" => "WebDAV autentikacija", +"Address: " => "Adresas:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. " ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/km.php b/core/l10n/km.php new file mode 100644 index 00000000000..556cca20dac --- /dev/null +++ b/core/l10n/km.php @@ -0,0 +1,8 @@ + array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day ago_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 7b0c3ed4f80..4c089b3e1b6 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s pasidalino »%s« su tavimi", "group" => "grupė", +"Turned on maintenance mode" => "Įjungta priežiūros veiksena", +"Turned off maintenance mode" => "Išjungta priežiūros veiksena", +"Updated database" => "Atnaujinta duomenų bazė", +"Updating filecache, this may take really long..." => "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai...", +"Updated filecache" => "Atnaujinta failų talpykla", +"... %d%% done ..." => "... %d%% atlikta ...", "Category type not provided." => "Kategorija nenurodyta.", "No category to add?" => "Nepridėsite jokios kategorijos?", "This category already exists: %s" => "Ši kategorija jau egzistuoja: %s", @@ -35,7 +41,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"), "today" => "šiandien", "yesterday" => "vakar", -"_%n day ago_::_%n days ago_" => array("","",""), +"_%n day ago_::_%n days ago_" => array("prieš %n dieną","prieš %n dienas","prieš %n dienų"), "last month" => "praeitą mėnesį", "_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"), "months ago" => "prieš mėnesį", @@ -61,6 +67,7 @@ $TRANSLATIONS = array( "Share with link" => "Dalintis nuoroda", "Password protect" => "Apsaugotas slaptažodžiu", "Password" => "Slaptažodis", +"Allow Public Upload" => "Leisti viešą įkėlimą", "Email link to person" => "Nusiųsti nuorodą paštu", "Send" => "Siųsti", "Set expiration date" => "Nustatykite galiojimo laiką", @@ -89,6 +96,7 @@ $TRANSLATIONS = array( "Request failed!
      Did you make sure your email/username was right?" => "Klaida!
      Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?", "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.", "Username" => "Prisijungimo vardas", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?", "Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį", "Request reset" => "Prašyti nustatymo iš najo", "Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo", @@ -102,13 +110,16 @@ $TRANSLATIONS = array( "Help" => "Pagalba", "Access forbidden" => "Priėjimas draudžiamas", "Cloud not found" => "Negalima rasti", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!", "Edit categories" => "Redaguoti kategorijas", "Add" => "Pridėti", "Security Warning" => "Saugumo pranešimas", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.", +"For information how to properly configure your server, please see the documentation." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti dokumentaciją.", "Create an admin account" => "Sukurti administratoriaus paskyrą", "Advanced" => "Išplėstiniai", "Data folder" => "Duomenų katalogas", @@ -129,6 +140,7 @@ $TRANSLATIONS = array( "remember" => "prisiminti", "Log in" => "Prisijungti", "Alternative Logins" => "Alternatyvūs prisijungimai", +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" => "Labas,

      tik informuojame, kad %s pasidalino su Jumis »%s«.
      Peržiūrėk!

      Linkėjimai!", "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 7f4e34cb555..4198ec91294 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -5,6 +5,8 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Activado o modo de manutenção", "Turned off maintenance mode" => "Desactivado o modo de manutenção", "Updated database" => "Base de dados actualizada", +"Updating filecache, this may take really long..." => "A actualizar o cache dos ficheiros, poderá demorar algum tempo...", +"Updated filecache" => "Actualizado o cache dos ficheiros", "... %d%% done ..." => "... %d%% feito ...", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", @@ -88,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "E-mail enviado", "The update was unsuccessful. Please report this issue to the ownCloud community." => "A actualização falhou. Por favor reporte este incidente seguindo este link ownCloud community.", "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.", +"%s password reset" => "%s reposição da password", "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "O link para fazer reset à sua password foi enviado para o seu e-mail.
      Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.
      Se não o encontrar, por favor contacte o seu administrador.", "Request failed!
      Did you make sure your email/username was right?" => "O pedido falhou!
      Tem a certeza que introduziu o seu email/username correcto?", diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 39c537e3a5d..565d98c14c1 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 13:30+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: ibrahim_9090 \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po index 7f7187cc9a9..df2684b93db 100644 --- a/l10n/ar/files_sharing.po +++ b/l10n/ar/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 3d91bd55b82..69c221b386c 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po index a2c0ad5b1cf..20f297f9cdc 100644 --- a/l10n/bg_BG/files_sharing.po +++ b/l10n/bg_BG/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index de8d7478780..e2785070c36 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -111,7 +111,7 @@ msgstr "URL ফাঁকা রাখা যাবে না।" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "সমস্যা" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "পূনঃনামকরণ" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "মুলতুবি" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} টি বিদ্যমান" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "প্রতিস্থাপন" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "নাম সুপারিশ করুন" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "বাতিল" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "ক্রিয়া প্রত্যাহার" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "রাম" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "আকার" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "পরিবর্তিত" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "ডাউনলোড" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "ভাগাভাগি বাতিল " -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "মুছে" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "আপলোডের আকারটি অনেক বড়" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন " -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "বর্তমান স্ক্যানিং" diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index 1b5320391c2..f44908ae2c1 100644 --- a/l10n/bn_BD/files_sharing.po +++ b/l10n/bn_BD/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 9dc1d5ffcc6..ca6a5240892 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po index 167cc378c2a..4e4d3419bae 100644 --- a/l10n/ca/files_sharing.po +++ b/l10n/ca/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 503fc964125..92e790b8785 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 08:10+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po index bf3385990f8..5b180f5c559 100644 --- a/l10n/cs_CZ/files_sharing.po +++ b/l10n/cs_CZ/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index 7507b666b09..aa667889430 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po index 7da44b1cba3..11970a0b139 100644 --- a/l10n/cy_GB/files_sharing.po +++ b/l10n/cy_GB/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/files.po b/l10n/da/files.po index fb180ee25be..81e48316bec 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 17:27+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po index 5af73cd665e..d5bee700f16 100644 --- a/l10n/da/files_sharing.po +++ b/l10n/da/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/files.po b/l10n/de/files.po index 21a1d8cafb2..3e0c024b6cb 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 18:00+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po index 188630a91ce..ad1e84807ea 100644 --- a/l10n/de/files_sharing.po +++ b/l10n/de/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po index 95d27fc4a67..bd65b087c35 100644 --- a/l10n/de_CH/files.po +++ b/l10n/de_CH/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po index c6ac0547088..8616c16eb64 100644 --- a/l10n/de_CH/files_sharing.po +++ b/l10n/de_CH/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: FlorianScholz \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index cf3e5f3eb62..e236b674b77 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 18:00+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po index 9d306a5899b..efed1ad727a 100644 --- a/l10n/de_DE/files_sharing.po +++ b/l10n/de_DE/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" diff --git a/l10n/el/files.po b/l10n/el/files.po index bd017bcd8e7..24da73a436f 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po index 4435befcebf..7185b97f854 100644 --- a/l10n/el/files_sharing.po +++ b/l10n/el/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po index f7d558ebe2a..ee07f5bbe41 100644 --- a/l10n/en_GB/files.po +++ b/l10n/en_GB/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:40+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po index e77bb9c6100..99cac4331f6 100644 --- a/l10n/en_GB/files_sharing.po +++ b/l10n/en_GB/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 3db69832bef..74589468882 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po index 3da45d867e4..cc9cb10772a 100644 --- a/l10n/eo/files_sharing.po +++ b/l10n/eo/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/es/files.po b/l10n/es/files.po index 5f5825ab799..e68841cb875 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 18:10+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-13 23:50+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 7fa3515a060..26442ede404 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-13 23:50+0000\n" "Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 511d60fc104..68680594d18 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-10 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: cnngimenez\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index 376086d3b93..cea65819e72 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" -"PO-Revision-Date: 2013-09-11 10:30+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: cjtess \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 8d69c7a8a99..fbe5fabbcf3 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" -"PO-Revision-Date: 2013-09-11 10:48+0000\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-11 11:00+0000\n" "Last-Translator: cjtess \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -366,7 +366,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -388,7 +388,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index de1769914cc..943c2186c0c 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-04 05:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index 73328253ec5..438e1fb60a3 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 4456f2df9e3..d48f767a56a 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po index 433b86d0b54..ce629410a61 100644 --- a/l10n/eu/files_sharing.po +++ b/l10n/eu/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 1db2606ef50..4c7fbe5528e 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po index b14ebbf89df..14a3c4edfa7 100644 --- a/l10n/fa/files_sharing.po +++ b/l10n/fa/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 2c0837f88bc..34fe35c6ce9 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 17:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po index 31b531d8cf1..a2ffb0fc827 100644 --- a/l10n/fi_FI/files_sharing.po +++ b/l10n/fi_FI/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index f02613e51df..f3e3767ce8b 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-06 15:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: ogre_sympathique \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index 581738c45f6..c9b74a2e271 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 3a9323639d0..f1ef8190bbc 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-03 12:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po index 1d3d82f4111..bd0b79c5d8b 100644 --- a/l10n/gl/files_sharing.po +++ b/l10n/gl/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/files.po b/l10n/he/files.po index dd480450974..653e107a6e2 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po index c7274f6691f..c181aa3c1ee 100644 --- a/l10n/he/files_sharing.po +++ b/l10n/he/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index b576a0b7cb1..fad167ba7b8 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Greška" @@ -127,60 +127,60 @@ msgstr "" msgid "Rename" msgstr "Promjeni ime" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "U tijeku" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "zamjeni" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "predloži ime" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "odustani" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "vrati" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "datoteke se učitavaju" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Ime" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Veličina" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Zadnja promjena" @@ -303,33 +303,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Nema ničega u ovoj mapi. Pošalji nešto!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Preuzimanje" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Makni djeljenje" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Obriši" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Prijenos je preobiman" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Datoteke se skeniraju, molimo pričekajte." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Trenutno skeniranje" diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po index 5d9fd41cb78..308e9e98755 100644 --- a/l10n/hr/files_sharing.po +++ b/l10n/hr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 402bd723361..7843881e215 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 9e79db98f68..ae03dc98f23 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 97ce4fab714..391f76c987c 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nomine" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Dimension" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificate" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Nihil hic. Incarga alcun cosa!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Discargar" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Deler" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Incargamento troppo longe" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po index 279865aadcc..83dfe3acf59 100644 --- a/l10n/ia/files_sharing.po +++ b/l10n/ia/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/id/files.po b/l10n/id/files.po index 5d512ec38db..2ce822890c6 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "URL tidak boleh kosong" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Galat" @@ -127,54 +127,54 @@ msgstr "Hapus secara permanen" msgid "Rename" msgstr "Ubah nama" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Menunggu" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} sudah ada" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ganti" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "sarankan nama" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "batalkan" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "mengganti {new_name} dengan {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "urungkan" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "berkas diunggah" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar." -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nama" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Ukuran" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Dimodifikasi" @@ -297,33 +297,33 @@ msgstr "Anda tidak memiliki izin menulis di sini." msgid "Nothing in here. Upload something!" msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Unduh" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Batalkan berbagi" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Hapus" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Yang diunggah terlalu besar" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Berkas sedang dipindai, silakan tunggu." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Yang sedang dipindai" diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po index e33e3ae08f7..4c5ff880016 100644 --- a/l10n/id/files_sharing.po +++ b/l10n/id/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/is/files.po b/l10n/is/files.po index 10e1d535f40..b5561e49004 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "Vefslóð má ekki vera tóm." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Villa" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "Endurskýra" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Bíður" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} er þegar til" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "yfirskrifa" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "stinga upp á nafni" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "hætta við" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "yfirskrifaði {new_name} með {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "afturkalla" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nafn" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Stærð" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Breytt" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Ekkert hér. Settu eitthvað inn!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Niðurhal" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Hætta deilingu" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Eyða" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Innsend skrá er of stór" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Verið er að skima skrár, vinsamlegast hinkraðu." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Er að skima" diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index 836b3e5bb60..bfd1462e056 100644 --- a/l10n/is/files_sharing.po +++ b/l10n/is/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/it/files.po b/l10n/it/files.po index 58b33501e9e..b97ed259366 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 15:54+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po index 33452f2b84e..01ae61c6aea 100644 --- a/l10n/it/files_sharing.po +++ b/l10n/it/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 249beb05f61..bcb42ff87e3 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 00:40+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: tt yn \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po index 0fea02f11c3..71e37cb9fda 100644 --- a/l10n/ja_JP/files_sharing.po +++ b/l10n/ja_JP/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: tt yn \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 36a1787cd34..56fff63712a 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po index febee9664fc..c53f2326209 100644 --- a/l10n/ka_GE/files_sharing.po +++ b/l10n/ka_GE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/km/core.po b/l10n/km/core.po new file mode 100644 index 00000000000..d989389afcf --- /dev/null +++ b/l10n/km/core.po @@ -0,0 +1,643 @@ +# 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-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: ajax/share.php:227 +msgid "group" +msgstr "" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "" + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:33 +msgid "Monday" +msgstr "" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "" + +#: js/config.php:36 +msgid "Thursday" +msgstr "" + +#: js/config.php:37 +msgid "Friday" +msgstr "" + +#: js/config.php:38 +msgid "Saturday" +msgstr "" + +#: js/config.php:43 +msgid "January" +msgstr "" + +#: js/config.php:44 +msgid "February" +msgstr "" + +#: js/config.php:45 +msgid "March" +msgstr "" + +#: js/config.php:46 +msgid "April" +msgstr "" + +#: js/config.php:47 +msgid "May" +msgstr "" + +#: js/config.php:48 +msgid "June" +msgstr "" + +#: js/config.php:49 +msgid "July" +msgstr "" + +#: js/config.php:50 +msgid "August" +msgstr "" + +#: js/config.php:51 +msgid "September" +msgstr "" + +#: js/config.php:52 +msgid "October" +msgstr "" + +#: js/config.php:53 +msgid "November" +msgstr "" + +#: js/config.php:54 +msgid "December" +msgstr "" + +#: js/js.js:355 +msgid "Settings" +msgstr "" + +#: js/js.js:821 +msgid "seconds ago" +msgstr "" + +#: js/js.js:822 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" + +#: js/js.js:823 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" + +#: js/js.js:824 +msgid "today" +msgstr "" + +#: js/js.js:825 +msgid "yesterday" +msgstr "" + +#: js/js.js:826 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" + +#: js/js.js:827 +msgid "last month" +msgstr "" + +#: js/js.js:828 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" + +#: js/js.js:829 +msgid "months ago" +msgstr "" + +#: js/js.js:830 +msgid "last year" +msgstr "" + +#: js/js.js:831 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:210 +msgid "Error loading file picker template" +msgstr "" + +#: js/oc-dialogs.js:168 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:178 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:195 +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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:643 js/share.js:655 +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:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "" + +#: js/share.js:90 +msgid "Share" +msgstr "" + +#: js/share.js:131 js/share.js:683 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:183 +msgid "Share with" +msgstr "" + +#: js/share.js:188 +msgid "Share with link" +msgstr "" + +#: js/share.js:191 +msgid "Password protect" +msgstr "" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "" + +#: js/share.js:203 +msgid "Send" +msgstr "" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Share via email:" +msgstr "" + +#: js/share.js:243 +msgid "No people found" +msgstr "" + +#: js/share.js:281 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:317 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:338 +msgid "Unshare" +msgstr "" + +#: js/share.js:350 +msgid "can edit" +msgstr "" + +#: js/share.js:352 +msgid "access control" +msgstr "" + +#: js/share.js:355 +msgid "create" +msgstr "" + +#: js/share.js:358 +msgid "update" +msgstr "" + +#: js/share.js:361 +msgid "delete" +msgstr "" + +#: js/share.js:364 +msgid "share" +msgstr "" + +#: js/share.js:398 js/share.js:630 +msgid "Password protected" +msgstr "" + +#: js/share.js:643 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:655 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:670 +msgid "Sending ..." +msgstr "" + +#: js/share.js:681 +msgid "Email sent" +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:62 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
      If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
      If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
      Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +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 templates/layout.user.php:105 +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:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:33 +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:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:66 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:37 +msgid "remember" +msgstr "" + +#: templates/login.php:39 +msgid "Log in" +msgstr "" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/km/files.po b/l10n/km/files.po new file mode 100644 index 00000000000..286dded35fb --- /dev/null +++ b/l10n/km/files.po @@ -0,0 +1,332 @@ +# 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-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:12 +msgid "Files" +msgstr "" + +#: js/file-upload.js:11 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:24 +msgid "Not enough space available" +msgstr "" + +#: js/file-upload.js:64 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:165 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:239 +msgid "URL cannot be empty." +msgstr "" + +#: js/file-upload.js:244 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "" + +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +msgid "Error" +msgstr "" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "" + +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +msgid "Pending" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "replace" +msgstr "" + +#: js/filelist.js:307 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:307 js/filelist.js:309 +msgid "cancel" +msgstr "" + +#: js/filelist.js:354 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:354 +msgid "undo" +msgstr "" + +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: js/filelist.js:432 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:563 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" + +#: js/filelist.js:628 +msgid "files uploading" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/files.js:245 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:563 templates/index.php:69 +msgid "Name" +msgstr "" + +#: js/files.js:564 templates/index.php:81 +msgid "Size" +msgstr "" + +#: js/files.js:565 templates/index.php:83 +msgid "Modified" +msgstr "" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:41 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:52 +msgid "You don’t have write permissions here." +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:75 +msgid "Download" +msgstr "" + +#: templates/index.php:88 templates/index.php:89 +msgid "Unshare" +msgstr "" + +#: templates/index.php:94 templates/index.php:95 +msgid "Delete" +msgstr "" + +#: templates/index.php:108 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:110 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:115 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:118 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po new file mode 100644 index 00000000000..95e07fb9557 --- /dev/null +++ b/l10n/km/files_encryption.po @@ -0,0 +1,176 @@ +# 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-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: hooks/hooks.php:51 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:52 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "" + +#: hooks/hooks.php:250 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "" + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po new file mode 100644 index 00000000000..bca243c4597 --- /dev/null +++ b/l10n/km/files_external.po @@ -0,0 +1,123 @@ +# 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-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:453 +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:457 +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 "" + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:12 +msgid "Options" +msgstr "" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:90 +msgid "None set" +msgstr "" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "" + +#: templates/settings.php:100 +msgid "Users" +msgstr "" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po new file mode 100644 index 00000000000..f12cf3ccbe1 --- /dev/null +++ b/l10n/km/files_sharing.po @@ -0,0 +1,80 @@ +# 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-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:26 templates/public.php:92 +msgid "Download" +msgstr "" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "" + +#: templates/public.php:89 +msgid "No preview available for" +msgstr "" diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po new file mode 100644 index 00000000000..f3aa613a53e --- /dev/null +++ b/l10n/km/files_trashbin.po @@ -0,0 +1,82 @@ +# 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-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:184 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:185 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:193 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" + +#: js/trash.js:199 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "" diff --git a/l10n/km/files_versions.po b/l10n/km/files_versions.po new file mode 100644 index 00000000000..f9b37bb0cc3 --- /dev/null +++ b/l10n/km/files_versions.po @@ -0,0 +1,43 @@ +# 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-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:7 +msgid "Versions" +msgstr "" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:79 +msgid "More versions..." +msgstr "" + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:145 +msgid "Restore" +msgstr "" diff --git a/l10n/km/lib.po b/l10n/km/lib.po new file mode 100644 index 00000000000..a5ed3a8ca32 --- /dev/null +++ b/l10n/km/lib.po @@ -0,0 +1,318 @@ +# 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-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: app.php:250 +msgid "No app name specified" +msgstr "" + +#: app.php:361 +msgid "Help" +msgstr "" + +#: app.php:374 +msgid "Personal" +msgstr "" + +#: app.php:385 +msgid "Settings" +msgstr "" + +#: app.php:397 +msgid "Users" +msgstr "" + +#: app.php:410 +msgid "Admin" +msgstr "" + +#: app.php:839 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "" + +#: installer.php:125 +msgid "App does not provide an info.xml file" +msgstr "" + +#: installer.php:131 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: installer.php:140 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: installer.php:146 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: installer.php:152 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: installer.php:162 +msgid "App directory already exists" +msgstr "" + +#: installer.php:175 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template/functions.php:96 +msgid "seconds ago" +msgstr "" + +#: template/functions.php:97 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" + +#: template/functions.php:98 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" + +#: template/functions.php:99 +msgid "today" +msgstr "" + +#: template/functions.php:100 +msgid "yesterday" +msgstr "" + +#: template/functions.php:101 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" + +#: template/functions.php:102 +msgid "last month" +msgstr "" + +#: template/functions.php:103 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" + +#: template/functions.php:104 +msgid "last year" +msgstr "" + +#: template/functions.php:105 +msgid "years ago" +msgstr "" + +#: template.php:297 +msgid "Caused by:" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/km/settings.po b/l10n/km/settings.po new file mode 100644 index 00000000000..e0c2cf04ddb --- /dev/null +++ b/l10n/km/settings.po @@ -0,0 +1,540 @@ +# 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-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "" + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:126 +msgid "Error" +msgstr "" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "" + +#: js/apps.js:130 +msgid "Updated" +msgstr "" + +#: js/personal.js:150 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:172 +msgid "Saving..." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 +msgid "Groups" +msgstr "" + +#: js/users.js:97 templates/users.php:89 templates/users.php:124 +msgid "Group Admin" +msgstr "" + +#: js/users.js:120 templates/users.php:164 +msgid "Delete" +msgstr "" + +#: js/users.js:277 +msgid "add group" +msgstr "" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:40 personal.php:41 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "" + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:92 +msgid "Cron" +msgstr "" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "" + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "" + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:170 +msgid "Security" +msgstr "" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:203 +msgid "Log" +msgstr "" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "" + +#: templates/admin.php:235 +msgid "More" +msgstr "" + +#: templates/admin.php:236 +msgid "Less" +msgstr "" + +#: templates/admin.php:242 templates/personal.php:140 +msgid "Version" +msgstr "" + +#: templates/admin.php:246 templates/personal.php:143 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:86 +msgid "Password" +msgstr "" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:44 +msgid "New password" +msgstr "" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "" + +#: templates/personal.php:58 templates/users.php:85 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:73 +msgid "Email" +msgstr "" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:85 templates/personal.php:86 +msgid "Language" +msgstr "" + +#: templates/personal.php:98 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:104 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:106 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "" + +#: templates/personal.php:117 +msgid "Encryption" +msgstr "" + +#: templates/personal.php:119 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "" + +#: templates/personal.php:125 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:130 +msgid "Decrypt all Files" +msgstr "" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "" + +#: templates/users.php:30 +msgid "Create" +msgstr "" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:48 templates/users.php:142 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:66 templates/users.php:157 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Username" +msgstr "" + +#: templates/users.php:91 +msgid "Storage" +msgstr "" + +#: templates/users.php:102 +msgid "change display name" +msgstr "" + +#: templates/users.php:106 +msgid "set new password" +msgstr "" + +#: templates/users.php:137 +msgid "Default" +msgstr "" diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po new file mode 100644 index 00000000000..c6be8c9e68f --- /dev/null +++ b/l10n/km/user_ldap.po @@ -0,0 +1,406 @@ +# 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-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:112 +msgid "Success" +msgstr "" + +#: js/settings.js:117 +msgid "Error" +msgstr "" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:37 +msgid "Host" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "" + +#: templates/settings.php:46 +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:47 +msgid "Password" +msgstr "" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:69 +msgid "Port" +msgstr "" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "" + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "" + +#: templates/settings.php:108 +msgid "Help" +msgstr "" diff --git a/l10n/km/user_webdavauth.po b/l10n/km/user_webdavauth.po new file mode 100644 index 00000000000..1b1ffbc4311 --- /dev/null +++ b/l10n/km/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "" + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index f97b6b2dd26..1ab0e4053ab 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po index fcbb87f743c..434e19ca27a 100644 --- a/l10n/ko/files_sharing.po +++ b/l10n/ko/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 65a43a82d90..99b5793ea0d 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-11 06:47-0400\n" -"PO-Revision-Date: 2013-09-10 18:00+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po index 1171bd5e1ae..d1abf7c6c82 100644 --- a/l10n/ku_IQ/files_sharing.po +++ b/l10n/ku_IQ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 02542786a65..94e9d242643 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Fehler" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ofbriechen" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "réckgängeg man" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Numm" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Gréisst" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Geännert" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Hei ass näischt. Lued eppes rop!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Download" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Net méi deelen" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Läschen" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Upload ze grouss" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Fichieren gi gescannt, war weg." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Momentane Scan" diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po index 29fcd6c34e9..3fba12cda24 100644 --- a/l10n/lb/files_sharing.po +++ b/l10n/lb/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index e8292e89ce8..8887099c7a2 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # mambuta , 2013 # Roman Deniobe , 2013 # fizikiukas , 2013 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-13 07:00+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,28 +32,28 @@ msgstr "grupė" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Įjungta priežiūros veiksena" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Išjungta priežiūros veiksena" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Atnaujinta duomenų bazė" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Atnaujinta failų talpykla" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% atlikta ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -202,9 +203,9 @@ msgstr "vakar" #: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "prieš %n dieną" +msgstr[1] "prieš %n dienas" +msgstr[2] "prieš %n dienų" #: js/js.js:827 msgid "last month" @@ -316,7 +317,7 @@ msgstr "Slaptažodis" #: js/share.js:198 msgid "Allow Public Upload" -msgstr "" +msgstr "Leisti viešą įkėlimą" #: js/share.js:202 msgid "Email link to person" @@ -444,7 +445,7 @@ msgid "" "will be no way to get your data back after your password is reset. If you " "are not sure what to do, please contact your administrator before you " "continue. Do you really want to continue?" -msgstr "" +msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?" #: lostpassword/templates/lostpassword.php:24 msgid "Yes, I really want to reset my password now" @@ -507,7 +508,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "" +msgstr "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -529,7 +530,7 @@ msgstr "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7 #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Prašome atnaujinti savo PHP, kad saugiai naudoti %s." #: templates/installation.php:32 msgid "" @@ -554,7 +555,7 @@ msgstr "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess fai msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti dokumentaciją." #: templates/installation.php:47 msgid "Create an admin account" @@ -646,7 +647,7 @@ msgstr "Alternatyvūs prisijungimai" msgid "" "Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" -msgstr "" +msgstr "Labas,

      tik informuojame, kad %s pasidalino su Jumis »%s«.
      Peržiūrėk!

      Linkėjimai!" #: templates/update.php:3 #, php-format diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index af72860fc58..13c09972ea5 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,11 +31,11 @@ msgstr "Nepavyko perkelti %s" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "Nepavyksta nustatyti įkėlimų katalogo." #: ajax/upload.php:22 msgid "Invalid Token" -msgstr "" +msgstr "Netinkamas ženklas" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" @@ -159,27 +160,27 @@ msgstr "anuliuoti" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n aplankas" +msgstr[1] "%n aplankai" +msgstr[2] "%n aplankų" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n failas" +msgstr[1] "%n failai" +msgstr[2] "%n failų" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} ir {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Įkeliamas %n failas" +msgstr[1] "Įkeliami %n failai" +msgstr[2] "Įkeliama %n failų" #: js/filelist.js:628 msgid "files uploading" @@ -211,7 +212,7 @@ msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus." #: js/files.js:245 msgid "" @@ -234,7 +235,7 @@ msgstr "Pakeista" #: lib/app.php:73 #, php-format msgid "%s could not be renamed" -msgstr "" +msgstr "%s negali būti pervadintas" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po index b8b075046ac..b37c78e711c 100644 --- a/l10n/lt_LT/files_encryption.po +++ b/l10n/lt_LT/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-13 08:20+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,13 +47,13 @@ msgstr "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas #: ajax/updatePrivateKeyPassword.php:51 msgid "Private key password successfully updated." -msgstr "" +msgstr "Privataus rakto slaptažodis buvo sėkmingai atnaujintas." #: ajax/updatePrivateKeyPassword.php:53 msgid "" "Could not update the private key password. Maybe the old password was not " "correct." -msgstr "" +msgstr "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis." #: files/error.php:7 msgid "" @@ -60,22 +61,22 @@ msgid "" "ownCloud system (e.g. your corporate directory). You can update your private" " key password in your personal settings to recover access to your encrypted " "files." -msgstr "" +msgstr "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." -msgstr "" +msgstr "Trūkstami laukai." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Sekantys naudotojai nenustatyti šifravimui:" #: js/settings-admin.js:11 msgid "Saving..." @@ -85,15 +86,15 @@ msgstr "Saugoma..." msgid "" "Your private key is not valid! Maybe the your password was changed from " "outside." -msgstr "" +msgstr "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?" #: templates/invalid_private_key.php:7 msgid "You can unlock your private key in your " -msgstr "" +msgstr "Galite atrakinti savo privatų raktą savo" #: templates/invalid_private_key.php:7 msgid "personal settings" -msgstr "" +msgstr "asmeniniai nustatymai" #: templates/settings-admin.php:5 templates/settings-personal.php:4 msgid "Encryption" @@ -102,11 +103,11 @@ msgstr "Šifravimas" #: templates/settings-admin.php:10 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" -msgstr "" +msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):" #: templates/settings-admin.php:14 msgid "Recovery key password" -msgstr "" +msgstr "Atkūrimo rakto slaptažodis" #: templates/settings-admin.php:21 templates/settings-personal.php:54 msgid "Enabled" @@ -118,15 +119,15 @@ msgstr "Išjungta" #: templates/settings-admin.php:34 msgid "Change recovery key password:" -msgstr "" +msgstr "Pakeisti atkūrimo rakto slaptažodį:" #: templates/settings-admin.php:41 msgid "Old Recovery key password" -msgstr "" +msgstr "Senas atkūrimo rakto slaptažodis" #: templates/settings-admin.php:48 msgid "New Recovery key password" -msgstr "" +msgstr "Naujas atkūrimo rakto slaptažodis" #: templates/settings-admin.php:53 msgid "Change Password" @@ -134,43 +135,43 @@ msgstr "Pakeisti slaptažodį" #: templates/settings-personal.php:11 msgid "Your private key password no longer match your log-in password:" -msgstr "" +msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:" #: templates/settings-personal.php:14 msgid "Set your old private key password to your current log-in password." -msgstr "" +msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo." #: templates/settings-personal.php:16 msgid "" " If you don't remember your old password you can ask your administrator to " "recover your files." -msgstr "" +msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus." #: templates/settings-personal.php:24 msgid "Old log-in password" -msgstr "" +msgstr "Senas prisijungimo slaptažodis" #: templates/settings-personal.php:30 msgid "Current log-in password" -msgstr "" +msgstr "Dabartinis prisijungimo slaptažodis" #: templates/settings-personal.php:35 msgid "Update Private Key Password" -msgstr "" +msgstr "Atnaujinti privataus rakto slaptažodį" #: templates/settings-personal.php:45 msgid "Enable password recovery:" -msgstr "" +msgstr "Įjungti slaptažodžio atkūrimą:" #: templates/settings-personal.php:47 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files in case of password loss" -msgstr "" +msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį." #: templates/settings-personal.php:63 msgid "File recovery settings updated" -msgstr "Failų atstatymo nustatymai pakeisti" +msgstr "Failų atkūrimo nustatymai pakeisti" #: templates/settings-personal.php:64 msgid "Could not update file recovery" diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po index 217b1dcfb16..1ce65e7a066 100644 --- a/l10n/lt_LT/files_sharing.po +++ b/l10n/lt_LT/files_sharing.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: templates/authenticate.php:4 msgid "The password is wrong. Try again." -msgstr "" +msgstr "Netinka slaptažodis: Bandykite dar kartą." #: templates/authenticate.php:7 msgid "Password" @@ -32,27 +33,27 @@ msgstr "Išsaugoti" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Atleiskite, panašu, kad nuoroda yra neveiksni." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Galimos priežastys:" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "elementas buvo pašalintas" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "baigėsi nuorodos galiojimo laikas" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "dalinimasis yra išjungtas" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą." #: templates/public.php:15 #, php-format diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po index febfc2f1b01..5e630911f65 100644 --- a/l10n/lt_LT/files_trashbin.po +++ b/l10n/lt_LT/files_trashbin.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-12 20:30+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,47 +29,47 @@ msgstr "Nepavyko negrįžtamai ištrinti %s" msgid "Couldn't restore %s" msgstr "Nepavyko atkurti %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "atkurti" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Klaida" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "failą ištrinti negrįžtamai" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Ištrinti negrįžtamai" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Pavadinimas" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Ištrinti" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n aplankų" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n failų" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "atstatyta" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po index d3d119b1c3f..e7bf83a2ed4 100644 --- a/l10n/lt_LT/files_versions.po +++ b/l10n/lt_LT/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 20:00+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,16 +29,16 @@ msgstr "Versijos" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Nepavyko atstatyti {file} į būseną {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "Daugiau versijų..." #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "Nėra daugiau versijų" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Atstatyti" diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po index 21df78c7b6a..357eeebae9a 100644 --- a/l10n/lt_LT/lib.po +++ b/l10n/lt_LT/lib.po @@ -4,13 +4,15 @@ # # Translators: # fizikiukas , 2013 +# Liudas , 2013 +# fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 20:00+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-13 07:00+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +25,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Nenurodytas programos pavadinimas" #: app.php:361 msgid "Help" @@ -49,10 +51,10 @@ msgstr "Vartotojai" msgid "Admin" msgstr "Administravimas" -#: app.php:837 +#: app.php:839 #, php-format msgid "Failed to upgrade \"%s\"." -msgstr "" +msgstr "Nepavyko pakelti „%s“ versijos." #: defaults.php:35 msgid "web services under your control" @@ -61,7 +63,7 @@ msgstr "jūsų valdomos web paslaugos" #: files.php:66 files.php:98 #, php-format msgid "cannot open \"%s\"" -msgstr "" +msgstr "nepavyksta atverti „%s“" #: files.php:226 msgid "ZIP download is turned off." @@ -83,63 +85,63 @@ msgstr "Pasirinkti failai per dideli archyvavimui į ZIP." msgid "" "Download the files in smaller chunks, seperately or kindly ask your " "administrator." -msgstr "" +msgstr "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus." #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nenurodytas šaltinis diegiant programą" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nenurodytas href diegiant programą iš http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nenurodytas kelias diegiant programą iš vietinio failo" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "%s tipo archyvai nepalaikomi" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Nepavyko atverti archyvo diegiant programą" -#: installer.php:123 +#: installer.php:125 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Programa nepateikia info.xml failo" -#: installer.php:129 +#: installer.php:131 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Programa negali būti įdiegta, nes turi neleistiną kodą" -#: installer.php:138 +#: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija" -#: installer.php:144 +#: installer.php:146 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Programa negali būti įdiegta, nes turi true žymę, kuri yra neleistina ne kartu platinamoms programoms" -#: installer.php:150 +#: installer.php:152 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje" -#: installer.php:160 +#: installer.php:162 msgid "App directory already exists" -msgstr "" +msgstr "Programos aplankas jau egzistuoja" -#: installer.php:173 +#: installer.php:175 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s" #: json.php:28 msgid "Application is not enabled" @@ -168,31 +170,31 @@ msgstr "Paveikslėliai" #: setup/abstractdatabase.php:22 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s įrašykite duombazės naudotojo vardą." #: setup/abstractdatabase.php:25 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s įrašykite duombazės pavadinimą." #: setup/abstractdatabase.php:28 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s negalite naudoti taškų duombazės pavadinime" #: setup/mssql.php:20 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s" #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 #: setup/postgresql.php:24 setup/postgresql.php:70 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi." #: setup/mysql.php:12 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis" #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 #: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 @@ -201,7 +203,7 @@ msgstr "" #: setup/postgresql.php:125 setup/postgresql.php:134 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "DB klaida: \"%s\"" #: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 #: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 @@ -209,119 +211,119 @@ msgstr "" #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Vykdyta komanda buvo: \"%s\"" #: setup/mysql.php:85 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "MySQL naudotojas '%s'@'localhost' jau egzistuoja." #: setup/mysql.php:86 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Pašalinti šį naudotoją iš MySQL" #: setup/mysql.php:91 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "MySQL naudotojas '%s'@'%%' jau egzistuoja" #: setup/mysql.php:92 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Pašalinti šį naudotoją iš MySQL." #: setup/oci.php:34 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Nepavyko sukurti Oracle ryšio" #: setup/oci.php:41 setup/oci.php:113 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis" #: setup/oci.php:173 setup/oci.php:205 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Vykdyta komanda buvo: \"%s\", name: %s, password: %s" #: setup/postgresql.php:23 setup/postgresql.php:69 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis" #: setup.php:28 msgid "Set an admin username." -msgstr "" +msgstr "Nustatyti administratoriaus naudotojo vardą." #: setup.php:31 msgid "Set an admin password." -msgstr "" +msgstr "Nustatyti administratoriaus slaptažodį." #: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta." #: setup.php:185 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Prašome pažiūrėkite dar kartą diegimo instrukcijas." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "prieš sekundę" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] " prieš %n minučių" +msgstr[0] "prieš %n min." +msgstr[1] "Prieš % minutes" +msgstr[2] "Prieš %n minučių" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "prieš %n valandų" +msgstr[0] "Prieš %n valandą" +msgstr[1] "Prieš %n valandas" +msgstr[2] "Prieš %n valandų" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "šiandien" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "vakar" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Prieš %n dieną" +msgstr[1] "Prieš %n dienas" +msgstr[2] "Prieš %n dienų" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "praeitą mėnesį" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "prieš %n mėnesių" +msgstr[0] "Prieš %n mėnesį" +msgstr[1] "Prieš %n mėnesius" +msgstr[2] "Prieš %n mėnesių" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "praeitais metais" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "prieš metus" #: template.php:297 msgid "Caused by:" -msgstr "" +msgstr "Iššaukė:" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Nepavyko rasti kategorijos „%s“" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index b60503e50a5..b8622c5d7bb 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -4,13 +4,16 @@ # # Translators: # fizikiukas , 2013 +# Liudas Ališauskas , 2013 +# Liudas , 2013 +# fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-13 07:50+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,11 +32,11 @@ msgstr "Autentikacijos klaida" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "" +msgstr "Jūsų rodomas vardas buvo pakeistas." #: ajax/changedisplayname.php:34 msgid "Unable to change display name" -msgstr "" +msgstr "Nepavyksta pakeisti rodomą vardą" #: ajax/creategroup.php:10 msgid "Group already exists" @@ -69,7 +72,7 @@ msgstr "Klaidinga užklausa" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Administratoriai negali pašalinti savęs iš administratorių grupės" #: ajax/togglegroups.php:30 #, php-format @@ -103,11 +106,11 @@ msgstr "Prašome palaukti..." #: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Klaida išjungiant programą" #: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Klaida įjungiant programą" #: js/apps.js:123 msgid "Updating...." @@ -131,7 +134,7 @@ msgstr "Atnaujinta" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti." #: js/personal.js:172 msgid "Saving..." @@ -156,7 +159,7 @@ msgstr "Grupės" #: js/users.js:97 templates/users.php:89 templates/users.php:124 msgid "Group Admin" -msgstr "" +msgstr "Grupės administratorius" #: js/users.js:120 templates/users.php:164 msgid "Delete" @@ -193,22 +196,22 @@ msgid "" "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 "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko." #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Nustatyti perspėjimą" #: templates/admin.php:32 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta." #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Prašome pažiūrėkite dar kartą diegimo instrukcijas." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -218,11 +221,11 @@ msgstr "Trūksta 'fileinfo' modulio" msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Lokalė neveikia" #: templates/admin.php:63 #, php-format @@ -230,11 +233,11 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s." #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "Nėra interneto ryšio" #: templates/admin.php:78 msgid "" @@ -243,7 +246,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas." #: templates/admin.php:92 msgid "Cron" @@ -251,17 +254,17 @@ msgstr "Cron" #: templates/admin.php:99 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu" #: templates/admin.php:107 msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę." #: templates/admin.php:120 msgid "Sharing" @@ -269,11 +272,11 @@ msgstr "Dalijimasis" #: templates/admin.php:126 msgid "Enable Share API" -msgstr "" +msgstr "Įjungti Share API" #: templates/admin.php:127 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Leidžia programoms naudoti Share API" #: templates/admin.php:134 msgid "Allow links" @@ -281,16 +284,16 @@ msgstr "Lesti nuorodas" #: templates/admin.php:135 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis" #: templates/admin.php:143 msgid "Allow public uploads" -msgstr "" +msgstr "Leisti viešus įkėlimus" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus" #: templates/admin.php:152 msgid "Allow resharing" @@ -298,15 +301,15 @@ msgstr "Leisti dalintis" #: templates/admin.php:153 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais" #: templates/admin.php:160 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Leisti naudotojams dalintis su bet kuo" #: templates/admin.php:163 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje" #: templates/admin.php:170 msgid "Security" @@ -314,19 +317,19 @@ msgstr "Saugumas" #: templates/admin.php:183 msgid "Enforce HTTPS" -msgstr "" +msgstr "Reikalauti HTTPS" #: templates/admin.php:185 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "" +msgstr "Verčia klientus jungtis prie %s per šifruotą ryšį." #: templates/admin.php:191 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą." #: templates/admin.php:203 msgid "Log" @@ -356,7 +359,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "Sukurta ownCloud bendruomenės, pirminis kodas platinamas pagal AGPL." #: templates/apps.php:13 msgid "Add your App" @@ -372,7 +375,7 @@ msgstr "Pasirinkite programą" #: templates/apps.php:39 msgid "See application page at apps.owncloud.com" -msgstr "" +msgstr "Žiūrėti programos puslapį svetainėje apps.owncloud.com" #: templates/apps.php:41 msgid "-licensed by " @@ -380,15 +383,15 @@ msgstr "- autorius" #: templates/help.php:4 msgid "User Documentation" -msgstr "" +msgstr "Naudotojo dokumentacija" #: templates/help.php:6 msgid "Administrator Documentation" -msgstr "" +msgstr "Administratoriaus dokumentacija" #: templates/help.php:9 msgid "Online Documentation" -msgstr "" +msgstr "Dokumentacija tinkle" #: templates/help.php:11 msgid "Forum" @@ -400,7 +403,7 @@ msgstr "Klaidų sekimas" #: templates/help.php:17 msgid "Commercial Support" -msgstr "" +msgstr "Komercinis palaikymas" #: templates/personal.php:8 msgid "Get the apps to sync your files" @@ -408,12 +411,12 @@ msgstr "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus" #: templates/personal.php:19 msgid "Show First Run Wizard again" -msgstr "" +msgstr "Rodyti pirmo karto vedlį dar kartą" #: templates/personal.php:27 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Jūs naudojate %s iš galimų %s" #: templates/personal.php:39 templates/users.php:23 templates/users.php:86 msgid "Password" @@ -441,7 +444,7 @@ msgstr "Pakeisti slaptažodį" #: templates/personal.php:58 templates/users.php:85 msgid "Display Name" -msgstr "" +msgstr "Rodyti vardą" #: templates/personal.php:73 msgid "Email" @@ -472,7 +475,7 @@ msgstr "WebDAV" msgid "" "Use this address to access your Files via WebDAV" -msgstr "" +msgstr "Naudokite šį adresą, kad pasiekti savo failus per WebDAV" #: templates/personal.php:117 msgid "Encryption" @@ -480,15 +483,15 @@ msgstr "Šifravimas" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Prisijungimo slaptažodis" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Iššifruoti visus failus" #: templates/users.php:21 msgid "Login Name" @@ -500,17 +503,17 @@ msgstr "Sukurti" #: templates/users.php:36 msgid "Admin Recovery Password" -msgstr "" +msgstr "Administracinis atkūrimo slaptažodis" #: templates/users.php:37 templates/users.php:38 msgid "" "Enter the recovery password in order to recover the users files during " "password change" -msgstr "" +msgstr "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį" #: templates/users.php:42 msgid "Default Storage" -msgstr "" +msgstr "Numatytas saugojimas" #: templates/users.php:48 templates/users.php:142 msgid "Unlimited" @@ -526,11 +529,11 @@ msgstr "Prisijungimo vardas" #: templates/users.php:91 msgid "Storage" -msgstr "" +msgstr "Saugojimas" #: templates/users.php:102 msgid "change display name" -msgstr "" +msgstr "keisti rodomą vardą" #: templates/users.php:106 msgid "set new password" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index a9962fc3311..5baac49ff31 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-12 21:00+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" @@ -108,7 +108,7 @@ msgstr "" #: templates/settings.php:37 msgid "Host" -msgstr "" +msgstr "Mazgas" #: templates/settings.php:39 msgid "" diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po index 72eda2b521b..fae87f29dda 100644 --- a/l10n/lt_LT/user_webdavauth.po +++ b/l10n/lt_LT/user_webdavauth.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas Ališauskas , 2013 # Min2liz , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-13 08:20+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "WebDAV autorizavimas" +msgstr "WebDAV autentikacija" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Adresas:" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. " diff --git a/l10n/lv/files.po b/l10n/lv/files.po index ac1b1e7ab6b..c173b6e331c 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po index 8c5c1f01416..036cfaf9607 100644 --- a/l10n/lv/files_sharing.po +++ b/l10n/lv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 19942eb2ca5..3d0602225b0 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "Адресата неможе да биде празна." msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Грешка" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "Преименувај" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Чека" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} веќе постои" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "замени" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "предложи име" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "откажи" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "заменета {new_name} со {old_name}" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "врати" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Име" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Големина" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Променето" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Преземи" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Не споделувај" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Избриши" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Фајлот кој се вчитува е преголем" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Се скенираат датотеки, ве молам почекајте." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Моментално скенирам" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index 0ae038b02ec..97b8547bc77 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index ce739248765..27f7519e9d3 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Ralat" @@ -127,54 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Dalam proses" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ganti" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "Batal" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nama" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Saiz" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Dimodifikasi" @@ -297,33 +297,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Tiada apa-apa di sini. Muat naik sesuatu!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Muat turun" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Padam" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Muatnaik terlalu besar" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Fail sedang diimbas, harap bersabar." -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Imbasan semasa" diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po index 936e15a9ccf..67cf9aabfb3 100644 --- a/l10n/ms_MY/files_sharing.po +++ b/l10n/ms_MY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 21093f1c7e0..318d4d445a5 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index 60ad1adffc2..02cbd3e982f 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index ab4c2589429..e8546df4ad2 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-06 20:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: kwillems \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index fd82bdc9534..1acf14b3297 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Len \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 4962e70e005..049246c47e1 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-06 10:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 30895eb8668..4b5c1c4d3ae 100644 --- a/l10n/nn_NO/files_sharing.po +++ b/l10n/nn_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-09 07:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/files.po b/l10n/oc/files.po index d33b8a7f8a8..1630f022556 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "Error" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "Torna nomenar" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "Al esperar" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "remplaça" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "nom prepausat" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "anulla" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "defar" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "fichièrs al amontcargar" @@ -215,15 +215,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Nom" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Talha" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Modificat" @@ -300,33 +300,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Pas res dedins. Amontcarga qualquaren" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Avalcarga" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "Pas partejador" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Escafa" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Amontcargament tròp gròs" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "Los fiichièrs son a èsser explorats, " -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "Exploracion en cors" diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po index f41c123348c..a94307e4bfd 100644 --- a/l10n/oc/files_sharing.po +++ b/l10n/oc/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index df1d1d20470..780faa39bcc 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-05 07:36-0400\n" -"PO-Revision-Date: 2013-09-05 09:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po index 7e1eb8ec3b6..0598448aa83 100644 --- a/l10n/pl/files_sharing.po +++ b/l10n/pl/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:40+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 258f0d4461c..b38bee5e902 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-10 13:30+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po index 186e192e9a2..0c110ef8250 100644 --- a/l10n/pt_BR/files_sharing.po +++ b/l10n/pt_BR/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 0af6cd62e19..3d908fc0d56 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-10 08:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" +"PO-Revision-Date: 2013-09-13 12:50+0000\n" "Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -44,11 +44,11 @@ msgstr "Base de dados actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "A actualizar o cache dos ficheiros, poderá demorar algum tempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Actualizado o cache dos ficheiros" #: ajax/update.php:26 #, php-format @@ -409,7 +409,7 @@ msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para #: lostpassword/controller.php:62 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s reposição da password" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 21d8f249a2b..7bd460d366b 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 14:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index ad35a566339..7db55d8e767 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 009d23f4d8b..0ac14ca3c91 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-11 06:47-0400\n" -"PO-Revision-Date: 2013-09-10 14:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: inaina \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po index 2904f399a43..e0a966d6e0f 100644 --- a/l10n/ro/files_sharing.po +++ b/l10n/ro/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index a97a10cc9ad..2db89c27daa 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index 4692762ac92..13ded27e566 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Den4md \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index ea7a70653c1..00c7fd92b17 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po index d64ece397ac..c09a00ba707 100644 --- a/l10n/si_LK/files_sharing.po +++ b/l10n/si_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 0ec318ec279..13b2c321e86 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po index 8cefa0e8452..8d7b07737fe 100644 --- a/l10n/sk_SK/files_sharing.po +++ b/l10n/sk_SK/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: mhh \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 79716d1228f..6b461d6107b 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 8032c31afc2..b038230f56a 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/sq/files.po b/l10n/sq/files.po index 949da8324ff..3bf0e4962c0 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-09 23:10+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po index f9206290886..e1a91f7789c 100644 --- a/l10n/sq/files_sharing.po +++ b/l10n/sq/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-10 10:41-0400\n" -"PO-Revision-Date: 2013-09-09 23:40+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: Odeen \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 5e4429bcc04..31dda625a60 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po index 1e1a3f4e98f..db4a7eeb22e 100644 --- a/l10n/sr/files_sharing.po +++ b/l10n/sr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index 429c1a1d2f6..c1b281b797f 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "" @@ -127,60 +127,60 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -218,15 +218,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "Ime" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "Veličina" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "Zadnja izmena" @@ -303,33 +303,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "Ovde nema ničeg. Pošaljite nešto!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "Obriši" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "Pošiljka je prevelika" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po index 00ac03d66b5..875bfffa7f3 100644 --- a/l10n/sr@latin/files_sharing.po +++ b/l10n/sr@latin/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 2e311fca6d7..6b498778cf9 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 16:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po index 908a393131d..2716b5f204c 100644 --- a/l10n/sv/files_sharing.po +++ b/l10n/sv/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index 392dfada7d8..cb81b1d0b54 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po index b38e26a728c..73a4ffdeae2 100644 --- a/l10n/ta_LK/files_sharing.po +++ b/l10n/ta_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index d5b1ea189bf..daf2ab164c5 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\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 6fae04c74e9..589bc8778d7 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:47-0400\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\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 5eca0032ab1..afb9805c52f 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:47-0400\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\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 a369531068c..befc1ea150d 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:47-0400\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\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 7c4c4ece848..132e5ad3b1d 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 2ac258974d0..73ddb5682f1 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\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 c7e4db14518..af6b2b14495 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\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 ccc2744b837..12b5037ea44 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,7 +49,7 @@ msgstr "" msgid "Admin" msgstr "" -#: app.php:837 +#: app.php:839 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" @@ -106,37 +106,37 @@ msgstr "" msgid "Failed to open archive when installing app" msgstr "" -#: installer.php:123 +#: installer.php:125 msgid "App does not provide an info.xml file" msgstr "" -#: installer.php:129 +#: installer.php:131 msgid "App can't be installed because of not allowed code in the App" msgstr "" -#: installer.php:138 +#: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" msgstr "" -#: installer.php:144 +#: installer.php:146 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" msgstr "" -#: installer.php:150 +#: installer.php:152 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" msgstr "" -#: installer.php:160 +#: installer.php:162 msgid "App directory already exists" msgstr "" -#: installer.php:173 +#: installer.php:175 #, php-format msgid "Can't create app folder. Please fix permissions. %s" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 0aa498898ee..bd59afab225 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\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 e9e02a20cdf..bcf45412cff 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\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 9ba2922286c..e4e6e90a9e2 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-11 06:48-0400\n" +"POT-Creation-Date: 2013-09-13 21:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index beceaab6f50..2bb54ad25e0 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po index b9a165c4814..467e3de3d83 100644 --- a/l10n/th_TH/files_sharing.po +++ b/l10n/th_TH/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index 5fe275702b0..e4878d5cdee 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po index ce183ac93d5..eea57d4dbd1 100644 --- a/l10n/tr/files_sharing.po +++ b/l10n/tr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/ug/files.po b/l10n/ug/files.po index 2872d4e43e4..3eabab5235b 100644 --- a/l10n/ug/files.po +++ b/l10n/ug/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "خاتالىق" @@ -127,54 +127,54 @@ msgstr "مەڭگۈلۈك ئۆچۈر" msgid "Rename" msgstr "ئات ئۆزگەرت" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "كۈتۈۋاتىدۇ" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "{new_name} مەۋجۇت" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "ئالماشتۇر" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "تەۋسىيە ئات" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "ۋاز كەچ" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "يېنىۋال" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "ھۆججەت يۈكلىنىۋاتىدۇ" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "ئاتى" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "چوڭلۇقى" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "ئۆزگەرتكەن" @@ -297,33 +297,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "چۈشۈر" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "ھەمبەھىرلىمە" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "ئۆچۈر" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "يۈكلەندىغىنى بەك چوڭ" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po index 7f92bdfcdd4..b1dd5be9643 100644 --- a/l10n/ug/files_sharing.po +++ b/l10n/ug/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 497990ded39..13cbcf24616 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-08 21:36-0400\n" -"PO-Revision-Date: 2013-09-08 12:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: zubr139 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index 668895e8dc0..c12dc78801e 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index bba27b3142c..ffc9063f5d7 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po index 16c04e7896b..f370ab63c63 100644 --- a/l10n/vi/files_sharing.po +++ b/l10n/vi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index a61fb2a34d3..e68d22da13a 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po index 94343f21828..5887baf02b7 100644 --- a/l10n/zh_CN/files_sharing.po +++ b/l10n/zh_CN/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: waterone \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index 32b94a8ffc9..ef901a270fc 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+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" @@ -111,7 +111,7 @@ msgstr "" msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 msgid "Error" msgstr "錯誤" @@ -127,54 +127,54 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:307 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:307 js/filelist.js:309 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:354 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:432 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 +#: js/filelist.js:628 msgid "files uploading" msgstr "" @@ -212,15 +212,15 @@ msgid "" "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:563 templates/index.php:69 msgid "Name" msgstr "名稱" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:564 templates/index.php:81 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:565 templates/index.php:83 msgid "Modified" msgstr "" @@ -297,33 +297,33 @@ msgstr "" msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:75 msgid "Download" msgstr "下載" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:88 templates/index.php:89 msgid "Unshare" msgstr "取消分享" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:94 templates/index.php:95 msgid "Delete" msgstr "刪除" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:110 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:115 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:118 msgid "Current scanning" msgstr "" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index f48a313ec7d..51163c90a96 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+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" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 260d80d6bf5..cc65168506e 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-09-01 13:20+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:00+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index 0b8ed355248..c59207bb90f 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-13 21:46-0400\n" +"PO-Revision-Date: 2013-09-14 00:01+0000\n" "Last-Translator: pellaeon \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/lib/l10n/km.php b/lib/l10n/km.php new file mode 100644 index 00000000000..e7b09649a24 --- /dev/null +++ b/lib/l10n/km.php @@ -0,0 +1,8 @@ + array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php index 242b0a23106..1fd9b9ea634 100644 --- a/lib/l10n/lt_LT.php +++ b/lib/l10n/lt_LT.php @@ -1,30 +1,69 @@ "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija.", +"No app name specified" => "Nenurodytas programos pavadinimas", "Help" => "Pagalba", "Personal" => "Asmeniniai", "Settings" => "Nustatymai", "Users" => "Vartotojai", "Admin" => "Administravimas", +"Failed to upgrade \"%s\"." => "Nepavyko pakelti „%s“ versijos.", "web services under your control" => "jūsų valdomos web paslaugos", +"cannot open \"%s\"" => "nepavyksta atverti „%s“", "ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.", "Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.", "Back to Files" => "Atgal į Failus", "Selected files too large to generate zip file." => "Pasirinkti failai per dideli archyvavimui į ZIP.", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus.", +"No source specified when installing app" => "Nenurodytas šaltinis diegiant programą", +"No href specified when installing app from http" => "Nenurodytas href diegiant programą iš http", +"No path specified when installing app from local file" => "Nenurodytas kelias diegiant programą iš vietinio failo", +"Archives of type %s are not supported" => "%s tipo archyvai nepalaikomi", +"Failed to open archive when installing app" => "Nepavyko atverti archyvo diegiant programą", +"App does not provide an info.xml file" => "Programa nepateikia info.xml failo", +"App can't be installed because of not allowed code in the App" => "Programa negali būti įdiegta, nes turi neleistiną kodą", +"App can't be installed because it is not compatible with this version of ownCloud" => "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Programa negali būti įdiegta, nes turi true žymę, kuri yra neleistina ne kartu platinamoms programoms", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje", +"App directory already exists" => "Programos aplankas jau egzistuoja", +"Can't create app folder. Please fix permissions. %s" => "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s", "Application is not enabled" => "Programa neįjungta", "Authentication error" => "Autentikacijos klaida", "Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.", "Files" => "Failai", "Text" => "Žinučių", "Images" => "Paveikslėliai", +"%s enter the database username." => "%s įrašykite duombazės naudotojo vardą.", +"%s enter the database name." => "%s įrašykite duombazės pavadinimą.", +"%s you may not use dots in the database name" => "%s negalite naudoti taškų duombazės pavadinime", +"MS SQL username and/or password not valid: %s" => "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s", +"You need to enter either an existing account or the administrator." => "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.", +"MySQL username and/or password not valid" => "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis", +"DB Error: \"%s\"" => "DB klaida: \"%s\"", +"Offending command was: \"%s\"" => "Vykdyta komanda buvo: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "MySQL naudotojas '%s'@'localhost' jau egzistuoja.", +"Drop this user from MySQL" => "Pašalinti šį naudotoją iš MySQL", +"MySQL user '%s'@'%%' already exists" => "MySQL naudotojas '%s'@'%%' jau egzistuoja", +"Drop this user from MySQL." => "Pašalinti šį naudotoją iš MySQL.", +"Oracle connection could not be established" => "Nepavyko sukurti Oracle ryšio", +"Oracle username and/or password not valid" => "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis", +"Offending command was: \"%s\", name: %s, password: %s" => "Vykdyta komanda buvo: \"%s\", name: %s, password: %s", +"PostgreSQL username and/or password not valid" => "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis", +"Set an admin username." => "Nustatyti administratoriaus naudotojo vardą.", +"Set an admin password." => "Nustatyti administratoriaus slaptažodį.", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.", +"Please double check the installation guides." => "Prašome pažiūrėkite dar kartą diegimo instrukcijas.", "seconds ago" => "prieš sekundę", -"_%n minute ago_::_%n minutes ago_" => array("",""," prieš %n minučių"), -"_%n hour ago_::_%n hours ago_" => array("","","prieš %n valandų"), +"_%n minute ago_::_%n minutes ago_" => array("prieš %n min.","Prieš % minutes","Prieš %n minučių"), +"_%n hour ago_::_%n hours ago_" => array("Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"), "today" => "šiandien", "yesterday" => "vakar", -"_%n day go_::_%n days ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"), "last month" => "praeitą mėnesį", -"_%n month ago_::_%n months ago_" => array("","","prieš %n mėnesių"), +"_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"), "last year" => "praeitais metais", -"years ago" => "prieš metus" +"years ago" => "prieš metus", +"Caused by:" => "Iššaukė:", +"Could not find category \"%s\"" => "Nepavyko rasti kategorijos „%s“" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index da0fb8f56b5..31c9e2be59f 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo", "Authentication error" => "Autentikacijos klaida", +"Your display name has been changed." => "Jūsų rodomas vardas buvo pakeistas.", +"Unable to change display name" => "Nepavyksta pakeisti rodomą vardą", "Group already exists" => "Grupė jau egzistuoja", "Unable to add group" => "Nepavyko pridėti grupės", "Email saved" => "El. paštas išsaugotas", @@ -10,6 +12,7 @@ $TRANSLATIONS = array( "Unable to delete user" => "Nepavyko ištrinti vartotojo", "Language changed" => "Kalba pakeista", "Invalid request" => "Klaidinga užklausa", +"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės", "Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s", "Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s", "Couldn't update app." => "Nepavyko atnaujinti programos.", @@ -17,16 +20,20 @@ $TRANSLATIONS = array( "Disable" => "Išjungti", "Enable" => "Įjungti", "Please wait...." => "Prašome palaukti...", +"Error while disabling app" => "Klaida išjungiant programą", +"Error while enabling app" => "Klaida įjungiant programą", "Updating...." => "Atnaujinama...", "Error while updating app" => "Įvyko klaida atnaujinant programą", "Error" => "Klaida", "Update" => "Atnaujinti", "Updated" => "Atnaujinta", +"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.", "Saving..." => "Saugoma...", "deleted" => "ištrinta", "undo" => "anuliuoti", "Unable to remove user" => "Nepavyko ištrinti vartotojo", "Groups" => "Grupės", +"Group Admin" => "Grupės administratorius", "Delete" => "Ištrinti", "add group" => "pridėti grupę", "A valid username must be provided" => "Vartotojo vardas turi būti tinkamas", @@ -34,42 +41,83 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Slaptažodis turi būti tinkamas", "__language_name__" => "Kalba", "Security Warning" => "Saugumo pranešimas", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.", +"Setup Warning" => "Nustatyti perspėjimą", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.", +"Please double check the installation guides." => "Prašome pažiūrėkite dar kartą diegimo instrukcijas.", "Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.", +"Locale not working" => "Lokalė neveikia", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s.", +"Internet connection not working" => "Nėra interneto ryšio", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.", "Cron" => "Cron", +"Execute one task with each page loaded" => "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http.", +"Use systems cron service to call the cron.php file once a minute." => "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę.", "Sharing" => "Dalijimasis", +"Enable Share API" => "Įjungti Share API", +"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API", "Allow links" => "Lesti nuorodas", +"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis", +"Allow public uploads" => "Leisti viešus įkėlimus", +"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus", "Allow resharing" => "Leisti dalintis", +"Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais", +"Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo", +"Allow users to only share with users in their groups" => "Leisti naudotojams dalintis tik su naudotojais savo grupėje", "Security" => "Saugumas", +"Enforce HTTPS" => "Reikalauti HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.", "Log" => "Žurnalas", "Log level" => "Žurnalo išsamumas", "More" => "Daugiau", "Less" => "Mažiau", "Version" => "Versija", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Sukurta ownCloud bendruomenės, pirminis kodas platinamas pagal AGPL.", "Add your App" => "Pridėti programėlę", "More Apps" => "Daugiau aplikacijų", "Select an App" => "Pasirinkite programą", +"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com", "-licensed by " => "- autorius", +"User Documentation" => "Naudotojo dokumentacija", +"Administrator Documentation" => "Administratoriaus dokumentacija", +"Online Documentation" => "Dokumentacija tinkle", "Forum" => "Forumas", "Bugtracker" => "Klaidų sekimas", +"Commercial Support" => "Komercinis palaikymas", "Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus", +"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą", +"You have used %s of the available %s" => "Jūs naudojate %s iš galimų %s", "Password" => "Slaptažodis", "Your password was changed" => "Jūsų slaptažodis buvo pakeistas", "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio", "Current password" => "Dabartinis slaptažodis", "New password" => "Naujas slaptažodis", "Change password" => "Pakeisti slaptažodį", +"Display Name" => "Rodyti vardą", "Email" => "El. Paštas", "Your email address" => "Jūsų el. pašto adresas", "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą", "Language" => "Kalba", "Help translate" => "Padėkite išversti", "WebDAV" => "WebDAV", +"Use this address to access your Files via WebDAV" => "Naudokite šį adresą, kad pasiekti savo failus per WebDAV", "Encryption" => "Šifravimas", +"The encryption app is no longer enabled, decrypt all your file" => "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus", +"Log-in password" => "Prisijungimo slaptažodis", +"Decrypt all Files" => "Iššifruoti visus failus", "Login Name" => "Vartotojo vardas", "Create" => "Sukurti", +"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis", +"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį", +"Default Storage" => "Numatytas saugojimas", "Unlimited" => "Neribota", "Other" => "Kita", "Username" => "Prisijungimo vardas", +"Storage" => "Saugojimas", +"change display name" => "keisti rodomą vardą", "set new password" => "nustatyti naują slaptažodį", "Default" => "Numatytasis" ); -- cgit v1.2.3 From 0f4e214a904952188747716b36f5dfd5a0f0c0d9 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sun, 15 Sep 2013 20:38:57 +0200 Subject: adding null check on a mount's storage --- lib/files/utils/scanner.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/files/utils/scanner.php b/lib/files/utils/scanner.php index f0dc41ffad3..2cad7dd77bd 100644 --- a/lib/files/utils/scanner.php +++ b/lib/files/utils/scanner.php @@ -72,6 +72,9 @@ class Scanner extends PublicEmitter { public function backgroundScan($dir) { $mounts = $this->getMounts($dir); foreach ($mounts as $mount) { + if (is_null($mount->getStorage())) { + continue; + } $scanner = $mount->getStorage()->getScanner(); $this->attachListener($mount); $scanner->backgroundScan(); @@ -81,6 +84,9 @@ class Scanner extends PublicEmitter { public function scan($dir) { $mounts = $this->getMounts($dir); foreach ($mounts as $mount) { + if (is_null($mount->getStorage())) { + continue; + } $scanner = $mount->getStorage()->getScanner(); $this->attachListener($mount); $scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG); -- cgit v1.2.3 From af0069bf032d2045abd18abf2e133835fc360481 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sun, 15 Sep 2013 22:24:57 +0200 Subject: adding getRootFolder() to server container and hooking up the new files api --- lib/public/iservercontainer.php | 8 ++++++++ lib/server.php | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 144c1a5b3b9..d88330698dc 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -54,4 +54,12 @@ interface IServerContainer { * @return \OCP\IPreview */ function getPreviewManager(); + + /** + * Returns the root folder of ownCloud's data directory + * + * @return \OCP\Files\Folder + */ + function getRootFolder(); + } diff --git a/lib/server.php b/lib/server.php index d85996612e9..9e87bd3190d 100644 --- a/lib/server.php +++ b/lib/server.php @@ -4,6 +4,8 @@ namespace OC; use OC\AppFramework\Http\Request; use OC\AppFramework\Utility\SimpleContainer; +use OC\Files\Node\Root; +use OC\Files\View; use OCP\IServerContainer; /** @@ -47,6 +49,14 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('PreviewManager', function($c){ return new PreviewManager(); }); + $this->registerService('RootFolder', function($c){ + // TODO: get user and user manager from container as well + $user = \OC_User::getUser(); + $user = \OC_User::getManager()->get($user); + $manager = \OC\Files\Filesystem::getMountManager(); + $view = new View(); + return new Root($manager, $view, $user); + }); } /** @@ -77,4 +87,14 @@ class Server extends SimpleContainer implements IServerContainer { { return $this->query('PreviewManager'); } + + /** + * Returns the root folder of ownCloud's data directory + * + * @return \OCP\Files\Folder + */ + function getRootFolder() + { + return $this->query('RootFolder'); + } } -- cgit v1.2.3 From 5d4e9e0d25831cbe1b9c2fef52016c6ed1bbcb55 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sun, 15 Sep 2013 23:07:18 +0200 Subject: /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized This fixes unit test execution --- lib/base.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 05d151439a4..1720a5fd7e1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -376,9 +376,6 @@ class OC { self::$loader->registerPrefix('Patchwork', '3rdparty'); spl_autoload_register(array(self::$loader, 'load')); - // setup the basic server - self::$server = new \OC\Server(); - // set some stuff //ob_start(); error_reporting(E_ALL | E_STRICT); @@ -458,6 +455,9 @@ class OC { stream_wrapper_register('quota', 'OC\Files\Stream\Quota'); stream_wrapper_register('oc', 'OC\Files\Stream\OC'); + // setup the basic server + self::$server = new \OC\Server(); + self::initTemplateEngine(); if (!self::$CLI) { self::initSession(); -- cgit v1.2.3 From eab84d3d9601802a852139a643c501018d3e6379 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 16 Sep 2013 02:17:39 +0200 Subject: Add OCP\DB::getErrorMessage() to public namespace. --- lib/public/db.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/public/db.php b/lib/public/db.php index 932e79d9ef1..9512cca2d19 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -102,4 +102,15 @@ class DB { public static function isError($result) { return(\OC_DB::isError($result)); } + + /** + * returns the error code and message as a string for logging + * works with DoctrineException + * @param mixed $error + * @return string + */ + public static function getErrorMessage($error) { + return(\OC_DB::getErrorMessage($error)); + } + } -- cgit v1.2.3 From 3c026b7cf601c0b83dd02436f17714fcf48cb9a8 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 16 Sep 2013 12:09:15 +0200 Subject: recreate an etag within the scanner if the cache contains an empty etag --- lib/files/cache/scanner.php | 8 +++++++- tests/lib/files/cache/scanner.php | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 9d180820e9d..78cab6ed2da 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -97,13 +97,19 @@ class Scanner extends BasicEmitter { } $newData = $data; if ($reuseExisting and $cacheData = $this->cache->get($file)) { + // prevent empty etag + $etag = $cacheData['etag']; + if (empty($etag)) { + $etag = $data['etag']; + } + // only reuse data if the file hasn't explicitly changed if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; } if ($reuseExisting & self::REUSE_ETAG) { - $data['etag'] = $cacheData['etag']; + $data['etag'] = $etag; } } // Only update metadata that has changed diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index f6deb93a49e..fa1b3406040 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -184,6 +184,23 @@ class Scanner extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->cache->inCache('folder/bar.txt')); } + public function testETagRecreation() { + $this->fillTestFolders(); + + $this->scanner->scan(''); + + // manipulate etag to simulate an empty etag + $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + $data['etag'] = ''; + $this->cache->put('', $data); + + // rescan + $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + $newData = $this->cache->get(''); + $this->assertNotEmpty($newData['etag']); + + } + function setUp() { $this->storage = new \OC\Files\Storage\Temporary(array()); $this->scanner = new \OC\Files\Cache\Scanner($this->storage); -- cgit v1.2.3 From a92d4c2c0932f5c662ed846763e3059ebdcde07c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Sep 2013 18:44:28 +0200 Subject: Perform expiration date checking before returning share data for token. --- lib/public/share.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 9ab956d84b9..cc3c4de6208 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -293,7 +293,18 @@ class Share { if (\OC_DB::isError($result)) { \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR); } - return $result->fetchRow(); + $row = $result->fetchRow(); + + if (!empty($row['expiration'])) { + $now = new \DateTime(); + $expirationDate = new \DateTime($row['expiration'], new \DateTimeZone('UTC')); + if ($now > $expirationDate) { + self::delete($row['id']); + return false; + } + } + + return $row; } /** -- cgit v1.2.3 From c8f9efeb94b136ed0906cefe946629a091796ff2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 16 Sep 2013 23:32:17 +0200 Subject: etag changes are now propagated up the file tree --- lib/files/cache/scanner.php | 14 ++++++++++++++ tests/lib/files/cache/scanner.php | 21 +++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 78cab6ed2da..fdbce0d51fe 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -99,8 +99,10 @@ class Scanner extends BasicEmitter { if ($reuseExisting and $cacheData = $this->cache->get($file)) { // prevent empty etag $etag = $cacheData['etag']; + $propagateETagChange = false; if (empty($etag)) { $etag = $data['etag']; + $propagateETagChange = true; } // only reuse data if the file hasn't explicitly changed @@ -110,6 +112,18 @@ class Scanner extends BasicEmitter { } if ($reuseExisting & self::REUSE_ETAG) { $data['etag'] = $etag; + if ($propagateETagChange) { + $parent = $file; + while ($parent !== '') { + $parent = dirname($parent); + if ($parent === '.') { + $parent = ''; + } + $parentCacheData = $this->cache->get($parent); + $parentCacheData['etag'] = $this->storage->getETag($parent); + $this->cache->put($parent, $parentCacheData); + } + } } } // Only update metadata that has changed diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index fa1b3406040..b137799bbcf 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -187,17 +187,26 @@ class Scanner extends \PHPUnit_Framework_TestCase { public function testETagRecreation() { $this->fillTestFolders(); - $this->scanner->scan(''); + $this->scanner->scan('folder/bar.txt'); // manipulate etag to simulate an empty etag $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); - $data['etag'] = ''; - $this->cache->put('', $data); + $data0 = $this->cache->get('folder/bar.txt'); + $data1 = $this->cache->get('folder'); + $data2 = $this->cache->get(''); + $data0['etag'] = ''; + $this->cache->put('folder/bar.txt', $data0); // rescan - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); - $newData = $this->cache->get(''); - $this->assertNotEmpty($newData['etag']); + $this->scanner->scan('folder/bar.txt', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + + // verify cache content + $newData0 = $this->cache->get('folder/bar.txt'); + $newData1 = $this->cache->get('folder'); + $newData2 = $this->cache->get(''); + $this->assertNotEmpty($newData0['etag']); + $this->assertNotEquals($data1['etag'], $newData1['etag']); + $this->assertNotEquals($data2['etag'], $newData2['etag']); } -- cgit v1.2.3 From 981a41e2cdb0848bea6c433577a7ae60d2920a00 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 17 Sep 2013 00:26:55 +0200 Subject: adding interface for middleware --- lib/public/appframework/imiddleware.php | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 lib/public/appframework/imiddleware.php (limited to 'lib') diff --git a/lib/public/appframework/imiddleware.php b/lib/public/appframework/imiddleware.php new file mode 100644 index 00000000000..9340034fcc9 --- /dev/null +++ b/lib/public/appframework/imiddleware.php @@ -0,0 +1,88 @@ +. + * + */ + + +namespace OCP\AppFramework; +use OCP\AppFramework\Http\Response; + + +/** + * Middleware is used to provide hooks before or after controller methods and + * deal with possible exceptions raised in the controller methods. + * They're modeled after Django's middleware system: + * https://docs.djangoproject.com/en/dev/topics/http/middleware/ + */ +interface MiddleWare { + + + /** + * This is being run in normal order before the controller is being + * called which allows several modifications and checks + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + */ + function beforeController($controller, $methodName); + + + /** + * This is being run when either the beforeController method or the + * controller method itself is throwing an exception. The middleware is + * asked in reverse order to handle the exception and to return a response. + * If the response is null, it is assumed that the exception could not be + * handled and the error will be thrown again + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param \Exception $exception the thrown exception + * @throws \Exception the passed in exception if it cant handle it + * @return Response a Response object in case that the exception was handled + */ + function afterException($controller, $methodName, \Exception $exception); + + /** + * This is being run after a successful controller method call and allows + * the manipulation of a Response object. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param Response $response the generated response from the controller + * @return Response a Response object + */ + function afterController($controller, $methodName, Response $response); + + /** + * This is being run after the response object has been rendered and + * allows the manipulation of the output. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param string $output the generated output from a response + * @return string the output that should be printed + */ + function beforeOutput($controller, $methodName, $output); +} -- cgit v1.2.3 From 822daa8f8adb9c31b9bfeac67ff165c18dc321c2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 17 Sep 2013 00:27:22 +0200 Subject: class files have to be lowercase --- lib/public/appframework/App.php | 81 ----------------------------------------- lib/public/appframework/app.php | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 lib/public/appframework/App.php create mode 100644 lib/public/appframework/app.php (limited to 'lib') diff --git a/lib/public/appframework/App.php b/lib/public/appframework/App.php deleted file mode 100644 index d97c5c81848..00000000000 --- a/lib/public/appframework/App.php +++ /dev/null @@ -1,81 +0,0 @@ -. - * - */ - -namespace OCP\AppFramework; - - -/** - * Class App - * @package OCP\AppFramework - * - * Any application must inherit this call - all controller instances to be used are - * to be registered using IContainer::registerService - */ -class App { - public function __construct($appName) { - $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName); - } - - private $container; - - /** - * @return IAppContainer - */ - public function getContainer() { - return $this->container; - } - - /** - * This function is called by the routing component to fire up the frameworks dispatch mechanism. - * - * Example code in routes.php of the task app: - * $this->create('tasks_index', '/')->get()->action( - * function($params){ - * $app = new TaskApp(); - * $app->dispatch('PageController', 'index', $params); - * } - * ); - * - * - * Example for for TaskApp implementation: - * class TaskApp extends \OCP\AppFramework\App { - * - * public function __construct(){ - * parent::__construct('tasks'); - * - * $this->getContainer()->registerService('PageController', function(IAppContainer $c){ - * $a = $c->query('API'); - * $r = $c->query('Request'); - * return new PageController($a, $r); - * }); - * } - * } - * - * @param string $controllerName the name of the controller under which it is - * stored in the DI container - * @param string $methodName the method that you want to call - * @param array $urlParams an array with variables extracted from the routes - */ - public function dispatch($controllerName, $methodName, array $urlParams) { - \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container); - } -} diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php new file mode 100644 index 00000000000..d97c5c81848 --- /dev/null +++ b/lib/public/appframework/app.php @@ -0,0 +1,81 @@ +. + * + */ + +namespace OCP\AppFramework; + + +/** + * Class App + * @package OCP\AppFramework + * + * Any application must inherit this call - all controller instances to be used are + * to be registered using IContainer::registerService + */ +class App { + public function __construct($appName) { + $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName); + } + + private $container; + + /** + * @return IAppContainer + */ + public function getContainer() { + return $this->container; + } + + /** + * This function is called by the routing component to fire up the frameworks dispatch mechanism. + * + * Example code in routes.php of the task app: + * $this->create('tasks_index', '/')->get()->action( + * function($params){ + * $app = new TaskApp(); + * $app->dispatch('PageController', 'index', $params); + * } + * ); + * + * + * Example for for TaskApp implementation: + * class TaskApp extends \OCP\AppFramework\App { + * + * public function __construct(){ + * parent::__construct('tasks'); + * + * $this->getContainer()->registerService('PageController', function(IAppContainer $c){ + * $a = $c->query('API'); + * $r = $c->query('Request'); + * return new PageController($a, $r); + * }); + * } + * } + * + * @param string $controllerName the name of the controller under which it is + * stored in the DI container + * @param string $methodName the method that you want to call + * @param array $urlParams an array with variables extracted from the routes + */ + public function dispatch($controllerName, $methodName, array $urlParams) { + \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container); + } +} -- cgit v1.2.3 From b9e943f5d52d1bf888233fdc2288477322591c43 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 17 Sep 2013 09:42:14 +0200 Subject: fix naming --- lib/public/appframework/imiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/appframework/imiddleware.php b/lib/public/appframework/imiddleware.php index 9340034fcc9..1e76d3bbe49 100644 --- a/lib/public/appframework/imiddleware.php +++ b/lib/public/appframework/imiddleware.php @@ -32,7 +32,7 @@ use OCP\AppFramework\Http\Response; * They're modeled after Django's middleware system: * https://docs.djangoproject.com/en/dev/topics/http/middleware/ */ -interface MiddleWare { +interface IMiddleWare { /** -- cgit v1.2.3 From fe86182dac387817258942a46905f2b801862d4d Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 17 Sep 2013 17:46:33 +0200 Subject: OC_Cache namespace changes and add UserCache to server container. Refs #4863 --- lib/base.php | 4 +-- lib/cache.php | 8 +++-- lib/cache/broker.php | 4 ++- lib/cache/file.php | 13 +++---- lib/cache/fileglobal.php | 7 ++-- lib/cache/fileglobalgc.php | 5 +-- lib/cache/usercache.php | 77 +++++++++++++++++++++++++++++++++++++++++ lib/filechunking.php | 2 +- lib/public/icache.php | 55 +++++++++++++++++++++++++++++ lib/public/iservercontainer.php | 7 ++++ lib/server.php | 34 +++++++++++------- tests/lib/cache/file.php | 30 ++++++++-------- tests/lib/cache/usercache.php | 68 ++++++++++++++++++++++++++++++++++++ 13 files changed, 270 insertions(+), 44 deletions(-) create mode 100644 lib/cache/usercache.php create mode 100644 lib/public/icache.php create mode 100644 tests/lib/cache/usercache.php (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 1720a5fd7e1..520be11bc52 100644 --- a/lib/base.php +++ b/lib/base.php @@ -564,11 +564,11 @@ class OC { if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup // register cache cleanup jobs try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception - \OCP\BackgroundJob::registerJob('OC_Cache_FileGlobalGC'); + \OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC'); } catch (Exception $e) { } - OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); + OC_Hook::connect('OC_User', 'post_login', 'OC\Cache\File', 'loginListener'); } } diff --git a/lib/cache.php b/lib/cache.php index 48b9964ba9d..c99663a0ca5 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -6,7 +6,9 @@ * See the COPYING-README file. */ -class OC_Cache { +namespace OC\Cache; + +class Cache { /** * @var OC_Cache $user_cache */ @@ -22,7 +24,7 @@ class OC_Cache { */ static public function getGlobalCache() { if (!self::$global_cache) { - self::$global_cache = new OC_Cache_FileGlobal(); + self::$global_cache = new FileGlobal(); } return self::$global_cache; } @@ -33,7 +35,7 @@ class OC_Cache { */ static public function getUserCache() { if (!self::$user_cache) { - self::$user_cache = new OC_Cache_File(); + self::$user_cache = new File(); } return self::$user_cache; } diff --git a/lib/cache/broker.php b/lib/cache/broker.php index a161dbfa3bb..b7f1b67a6d3 100644 --- a/lib/cache/broker.php +++ b/lib/cache/broker.php @@ -6,7 +6,9 @@ * See the COPYING-README file. */ -class OC_Cache_Broker { +namespace OC\Cache; + +class Broker { protected $fast_cache; protected $slow_cache; diff --git a/lib/cache/file.php b/lib/cache/file.php index 361138e4736..2ab914d17b8 100644 --- a/lib/cache/file.php +++ b/lib/cache/file.php @@ -6,24 +6,25 @@ * See the COPYING-README file. */ +namespace OC\Cache; -class OC_Cache_File{ +class File { protected $storage; protected function getStorage() { if (isset($this->storage)) { return $this->storage; } - if(OC_User::isLoggedIn()) { - \OC\Files\Filesystem::initMountPoints(OC_User::getUser()); + if(\OC_User::isLoggedIn()) { + \OC\Files\Filesystem::initMountPoints(\OC_User::getUser()); $subdir = 'cache'; - $view = new \OC\Files\View('/'.OC_User::getUser()); + $view = new \OC\Files\View('/' . \OC_User::getUser()); if(!$view->file_exists($subdir)) { $view->mkdir($subdir); } - $this->storage = new \OC\Files\View('/'.OC_User::getUser().'/'.$subdir); + $this->storage = new \OC\Files\View('/' . \OC_User::getUser().'/'.$subdir); return $this->storage; }else{ - OC_Log::write('core', 'Can\'t get cache storage, user not logged in', OC_Log::ERROR); + \OC_Log::write('core', 'Can\'t get cache storage, user not logged in', \OC_Log::ERROR); return false; } } diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php index c0bd8e45f39..9ca17402933 100644 --- a/lib/cache/fileglobal.php +++ b/lib/cache/fileglobal.php @@ -6,8 +6,9 @@ * See the COPYING-README file. */ +namespace OC\Cache; -class OC_Cache_FileGlobal{ +class FileGlobal { static protected function getCacheDir() { $cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/'; if (!is_dir($cache_dir)) { @@ -80,13 +81,13 @@ class OC_Cache_FileGlobal{ } static public function gc() { - $last_run = OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0); + $last_run = \OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0); $now = time(); if (($now - $last_run) < 300) { // only do cleanup every 5 minutes return; } - OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now); + \OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now); $cache_dir = self::getCacheDir(); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); diff --git a/lib/cache/fileglobalgc.php b/lib/cache/fileglobalgc.php index a29c31f9063..399dd5e6f94 100644 --- a/lib/cache/fileglobalgc.php +++ b/lib/cache/fileglobalgc.php @@ -1,8 +1,9 @@ userCache = new File(); + } + + /** + * Get a value from the user cache + * + * @param string $key + * @return mixed + */ + public function get($key) { + return $this->userCache->get($key); + } + + /** + * Set a value in the user cache + * + * @param string $key + * @param mixed $value + * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 + * @return bool + */ + public function set($key, $value, $ttl = 0) { + if (empty($key)) { + return false; + } + return $this->userCache->set($key, $value, $ttl); + } + + /** + * Check if a value is set in the user cache + * + * @param string $key + * @return bool + */ + public function hasKey($key) { + return $this->userCache->hasKey($key); + } + + /** + * Remove an item from the user cache + * + * @param string $key + * @return bool + */ + public function remove($key) { + return $this->userCache->remove($key); + } + + /** + * clear the user cache of all entries starting with a prefix + * @param string prefix (optional) + * @return bool + */ + public function clear($prefix = '') { + return $this->userCache->clear($prefix); + } +} diff --git a/lib/filechunking.php b/lib/filechunking.php index e6d69273a44..313a6ee87d2 100644 --- a/lib/filechunking.php +++ b/lib/filechunking.php @@ -29,7 +29,7 @@ class OC_FileChunking { protected function getCache() { if (!isset($this->cache)) { - $this->cache = new OC_Cache_File(); + $this->cache = new \OC\Cache\File(); } return $this->cache; } diff --git a/lib/public/icache.php b/lib/public/icache.php new file mode 100644 index 00000000000..202459f7c24 --- /dev/null +++ b/lib/public/icache.php @@ -0,0 +1,55 @@ +registerService('ContactsManager', function($c){ + $this->registerService('ContactsManager', function($c) { return new ContactsManager(); }); - $this->registerService('Request', function($c){ + $this->registerService('Request', function($c) { $params = array(); // we json decode the body only in case of content type json @@ -46,10 +46,10 @@ class Server extends SimpleContainer implements IServerContainer { ) ); }); - $this->registerService('PreviewManager', function($c){ + $this->registerService('PreviewManager', function($c) { return new PreviewManager(); }); - $this->registerService('RootFolder', function($c){ + $this->registerService('RootFolder', function($c) { // TODO: get user and user manager from container as well $user = \OC_User::getUser(); $user = \OC_User::getManager()->get($user); @@ -57,6 +57,9 @@ class Server extends SimpleContainer implements IServerContainer { $view = new View(); return new Root($manager, $view, $user); }); + $this->registerService('UserCache', function($c) { + return new UserCache(); + }); } /** @@ -67,14 +70,13 @@ class Server extends SimpleContainer implements IServerContainer { } /** - * The current request object holding all information about the request currently being processed - * is returned from this method. + * The current request object holding all information about the request + * currently being processed is returned from this method. * In case the current execution was not initiated by a web request null is returned * * @return \OCP\IRequest|null */ - function getRequest() - { + function getRequest() { return $this->query('Request'); } @@ -83,8 +85,7 @@ class Server extends SimpleContainer implements IServerContainer { * * @return \OCP\IPreview */ - function getPreviewManager() - { + function getPreviewManager() { return $this->query('PreviewManager'); } @@ -93,8 +94,17 @@ class Server extends SimpleContainer implements IServerContainer { * * @return \OCP\Files\Folder */ - function getRootFolder() - { + function getRootFolder() { return $this->query('RootFolder'); } + + /** + * Returns an ICache instance + * + * @return \OCP\ICache + */ + function getCache() { + return $this->query('UserCache'); + } + } diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 038cb21b257..3767c83fcb1 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -20,7 +20,9 @@ * */ -class Test_Cache_File extends Test_Cache { +namespace Test\Cache; + +class FileCache extends \Test_Cache { private $user; private $datadir; @@ -30,8 +32,8 @@ class Test_Cache_File extends Test_Cache { public function setUp() { //clear all proxies and hooks so we can do clean testing - OC_FileProxy::clearProxies(); - OC_Hook::clear('OC_Filesystem'); + \OC_FileProxy::clearProxies(); + \OC_Hook::clear('OC_Filesystem'); //disabled atm //enable only the encryption hook if needed @@ -44,27 +46,27 @@ class Test_Cache_File extends Test_Cache { $storage = new \OC\Files\Storage\Temporary(array()); \OC\Files\Filesystem::mount($storage,array(),'/'); $datadir = str_replace('local::', '', $storage->getId()); - $this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); - OC_Config::setValue('datadirectory', $datadir); + $this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data'); + \OC_Config::setValue('datadirectory', $datadir); - OC_User::clearBackends(); - OC_User::useBackend(new OC_User_Dummy()); + \OC_User::clearBackends(); + \OC_User::useBackend(new \OC_User_Dummy()); //login - OC_User::createUser('test', 'test'); + \OC_User::createUser('test', 'test'); - $this->user=OC_User::getUser(); - OC_User::setUserId('test'); + $this->user = \OC_User::getUser(); + \OC_User::setUserId('test'); //set up the users dir - $rootView=new \OC\Files\View(''); + $rootView = new \OC\Files\View(''); $rootView->mkdir('/test'); - $this->instance=new OC_Cache_File(); + $this->instance=new \OC\Cache\File(); } public function tearDown() { - OC_User::setUserId($this->user); - OC_Config::setValue('datadirectory', $this->datadir); + \OC_User::setUserId($this->user); + \OC_Config::setValue('datadirectory', $this->datadir); } } diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php new file mode 100644 index 00000000000..21b7f848ab6 --- /dev/null +++ b/tests/lib/cache/usercache.php @@ -0,0 +1,68 @@ +. +* +*/ + +namespace Test\Cache; + +class UserCache extends \Test_Cache { + private $user; + private $datadir; + + public function setUp() { + //clear all proxies and hooks so we can do clean testing + \OC_FileProxy::clearProxies(); + \OC_Hook::clear('OC_Filesystem'); + + //disabled atm + //enable only the encryption hook if needed + //if(OC_App::isEnabled('files_encryption')) { + // OC_FileProxy::register(new OC_FileProxy_Encryption()); + //} + + //set up temporary storage + \OC\Files\Filesystem::clearMounts(); + $storage = new \OC\Files\Storage\Temporary(array()); + \OC\Files\Filesystem::mount($storage,array(),'/'); + $datadir = str_replace('local::', '', $storage->getId()); + $this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data'); + \OC_Config::setValue('datadirectory', $datadir); + + \OC_User::clearBackends(); + \OC_User::useBackend(new \OC_User_Dummy()); + + //login + \OC_User::createUser('test', 'test'); + + $this->user = \OC_User::getUser(); + \OC_User::setUserId('test'); + + //set up the users dir + $rootView=new \OC\Files\View(''); + $rootView->mkdir('/test'); + + $this->instance=new \OC\Cache\UserCache(); + } + + public function tearDown() { + \OC_User::setUserId($this->user); + \OC_Config::setValue('datadirectory', $this->datadir); + } +} -- cgit v1.2.3 From 1a130627012bb17ed9edc4583a4d8250ff4e2882 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 17 Sep 2013 18:02:37 +0200 Subject: Add legacy wrapper --- lib/legacy/cache.php | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lib/legacy/cache.php (limited to 'lib') diff --git a/lib/legacy/cache.php b/lib/legacy/cache.php new file mode 100644 index 00000000000..83b214170f7 --- /dev/null +++ b/lib/legacy/cache.php @@ -0,0 +1,10 @@ + Date: Tue, 17 Sep 2013 18:31:14 +0200 Subject: Add interface for Session and add getter in server container. --- lib/public/iservercontainer.php | 7 +++++++ lib/public/isession.php | 44 +++++++++++++++++++++++++++++++++++++++++ lib/server.php | 10 ++++++++++ lib/session/session.php | 2 +- 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 lib/public/isession.php (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index d88330698dc..ec7212b306e 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -62,4 +62,11 @@ interface IServerContainer { */ function getRootFolder(); + /** + * Returns the current session + * + * @return \OCP\ISession + */ + function getSession(); + } diff --git a/lib/public/isession.php b/lib/public/isession.php new file mode 100644 index 00000000000..5f9ce32f3b1 --- /dev/null +++ b/lib/public/isession.php @@ -0,0 +1,44 @@ +query('RootFolder'); } + + /** + * Returns the current session + * + * @return \OCP\ISession + */ + function getSession() { + return \OC::$session; + } + } diff --git a/lib/session/session.php b/lib/session/session.php index 55515f57a87..c55001eccac 100644 --- a/lib/session/session.php +++ b/lib/session/session.php @@ -8,7 +8,7 @@ namespace OC\Session; -abstract class Session implements \ArrayAccess { +abstract class Session implements \ArrayAccess, \OCP\ISession { /** * $name serves as a namespace for the session keys * -- cgit v1.2.3 From 5bddb5377a40c987223804e8c3846437b6cf120a Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 17 Sep 2013 18:38:18 +0200 Subject: Purge session from Request - and fix some styles --- lib/appframework/http/request.php | 51 ++++++++++++--------------------------- lib/public/irequest.php | 9 ------- lib/server.php | 1 - 3 files changed, 16 insertions(+), 45 deletions(-) (limited to 'lib') diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php index 4f1775182a1..34605acdfea 100644 --- a/lib/appframework/http/request.php +++ b/lib/appframework/http/request.php @@ -33,16 +33,15 @@ class Request implements \ArrayAccess, \Countable, IRequest { protected $items = array(); protected $allowedKeys = array( - 'get', - 'post', - 'files', - 'server', - 'env', - 'session', - 'cookies', - 'urlParams', - 'params', - 'parameters', + 'get', + 'post', + 'files', + 'server', + 'env', + 'cookies', + 'urlParams', + 'params', + 'parameters', 'method' ); @@ -156,7 +155,6 @@ class Request implements \ArrayAccess, \Countable, IRequest { case 'files': case 'server': case 'env': - case 'session': case 'cookies': case 'parameters': case 'params': @@ -229,8 +227,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @param mixed $default If the key is not found, this value will be returned * @return mixed the content of the array */ - public function getParam($key, $default = null) - { + public function getParam($key, $default = null) { return isset($this->parameters[$key]) ? $this->parameters[$key] : $default; @@ -241,8 +238,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * (as GET or POST) or throuh the URL by the route * @return array the array with all parameters */ - public function getParams() - { + public function getParams() { return $this->parameters; } @@ -250,8 +246,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * Returns the method of the request * @return string the method of the request (POST, GET, etc) */ - public function getMethod() - { + public function getMethod() { return $this->method; } @@ -260,8 +255,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @param string $key the key that will be taken from the $_FILES array * @return array the file in the $_FILES element */ - public function getUploadedFile($key) - { + public function getUploadedFile($key) { return isset($this->files[$key]) ? $this->files[$key] : null; } @@ -270,28 +264,16 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @param string $key the key that will be taken from the $_ENV array * @return array the value in the $_ENV element */ - public function getEnv($key) - { + public function getEnv($key) { return isset($this->env[$key]) ? $this->env[$key] : null; } - /** - * Shortcut for getting session variables - * @param string $key the key that will be taken from the $_SESSION array - * @return array the value in the $_SESSION element - */ - function getSession($key) - { - return isset($this->session[$key]) ? $this->session[$key] : null; - } - /** * Shortcut for getting cookie variables * @param string $key the key that will be taken from the $_COOKIE array * @return array the value in the $_COOKIE element */ - function getCookie($key) - { + function getCookie($key) { return isset($this->cookies[$key]) ? $this->cookies[$key] : null; } @@ -304,8 +286,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * * @throws \LogicException */ - function getContent($asResource = false) - { + function getContent($asResource = false) { return null; // if (false === $this->content || (true === $asResource && null !== $this->content)) { // throw new \LogicException('getContent() can only be called once when using the resource return type.'); diff --git a/lib/public/irequest.php b/lib/public/irequest.php index cd39855950b..9f335b06f2a 100644 --- a/lib/public/irequest.php +++ b/lib/public/irequest.php @@ -76,15 +76,6 @@ interface IRequest { public function getEnv($key); - /** - * Shortcut for getting session variables - * - * @param string $key the key that will be taken from the $_SESSION array - * @return array the value in the $_SESSION element - */ - function getSession($key); - - /** * Shortcut for getting cookie variables * diff --git a/lib/server.php b/lib/server.php index 0124ad72c02..0eee3e0f73a 100644 --- a/lib/server.php +++ b/lib/server.php @@ -36,7 +36,6 @@ class Server extends SimpleContainer implements IServerContainer { 'files' => $_FILES, 'server' => $_SERVER, 'env' => $_ENV, - 'session' => $_SESSION, 'cookies' => $_COOKIE, 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] -- cgit v1.2.3 From b40925ae1747ae44a52fb1f8dcf7645d022c6f13 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Wed, 31 Jul 2013 22:24:52 +0200 Subject: initial scrollto implementation: use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present --- apps/files/css/files.css | 3 +++ apps/files/js/filelist.js | 41 ++++++++++++++++++++++++++++++++++----- apps/files/js/files.js | 5 +++++ core/js/js.js | 13 +++++++++++++ lib/search/provider/file.php | 3 ++- lib/search/result.php | 4 +++- search/css/results.css | 22 +++++++++++++++++++-- search/js/result.js | 38 ++++++++++++++++++++++++++++++------ search/templates/part.results.php | 3 ++- 9 files changed, 116 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 41d9808c56b..0acb3c5d829 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -76,6 +76,9 @@ #filestable tbody tr.selected { background-color: rgb(230,230,230); } +#filestable tbody tr.searchresult { + background-color: rgb(240,240,240); +} tbody a { color:#000; } span.extension, span.uploading, td.date { color:#999; } span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b50d46c98d3..9a2d39c3652 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -643,6 +643,37 @@ var FileList={ if (FileList._maskTimeout){ window.clearTimeout(FileList._maskTimeout); } + }, + scrollTo:function(file) { + //scroll to and highlight preselected file + var scrolltorow = $('tr[data-file="'+file+'"]'); + if (scrolltorow.length > 0) { + scrolltorow.addClass('searchresult'); + $(window).scrollTop(scrolltorow.position().top); + //remove highlight when hovered over + scrolltorow.one('hover', function(){ + scrolltorow.removeClass('searchresult'); + }); + } + }, + filter:function(query){ + $('#fileList tr:not(.summary)').each(function(i,e){ + if ($(e).data('file').toLowerCase().indexOf(query.toLowerCase()) !== -1) { + $(e).addClass("searchresult"); + } else { + $(e).removeClass("searchresult"); + } + }); + //do not use scrollto to prevent removing searchresult css class + var first = $('#fileList tr.searchresult').first(); + if (first.length !== 0) { + $(window).scrollTop(first.position().top); + } + }, + unfilter:function(){ + $('#fileList tr.searchresult').each(function(i,e){ + $(e).removeClass("searchresult"); + }); } }; @@ -818,16 +849,16 @@ $(document).ready(function(){ FileList.replaceIsNewFile = null; } FileList.lastAction = null; - OC.Notification.hide(); + OC.Notification.hide(); }); $('#notification:first-child').on('click', '.replace', function() { - OC.Notification.hide(function() { - FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile')); - }); + OC.Notification.hide(function() { + FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile')); + }); }); $('#notification:first-child').on('click', '.suggest', function() { $('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show(); - OC.Notification.hide(); + OC.Notification.hide(); }); $('#notification:first-child').on('click', '.cancel', function() { if ($('#notification > span').attr('data-isNewFile')) { diff --git a/apps/files/js/files.js b/apps/files/js/files.js index c2418cfa751..a4fdf383339 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -384,6 +384,11 @@ $(document).ready(function() { } }); } + + //scroll to and highlight preselected file + if (getURLParameter('scrollto')) { + FileList.scrollTo(getURLParameter('scrollto')); + } }); function scanFiles(force, dir, users){ diff --git a/core/js/js.js b/core/js/js.js index c09f80369f9..c23cf9eebd9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -723,11 +723,17 @@ $(document).ready(function(){ } }else if(event.keyCode===27){//esc OC.search.hide(); + if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system + FileList.unfilter(); + } }else{ var query=$('#searchbox').val(); if(OC.search.lastQuery!==query){ OC.search.lastQuery=query; OC.search.currentResult=-1; + if (FileList && typeof FileList.filter === 'function') { //TODO add hook system + FileList.filter(query); + } if(query.length>2){ OC.search(query); }else{ @@ -840,6 +846,13 @@ function formatDate(date){ return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } +// taken from http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery +function getURLParameter(name) { + return decodeURI( + (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1] + ); +} + /** * takes an absolute timestamp and return a string with a human-friendly relative date * @param int a Unix timestamp diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php index 4d88c2a87f1..9bd50931517 100644 --- a/lib/search/provider/file.php +++ b/lib/search/provider/file.php @@ -10,6 +10,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{ $mime = $fileData['mimetype']; $name = basename($path); + $container = dirname($path); $text = ''; $skip = false; if($mime=='httpd/unix-directory') { @@ -37,7 +38,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{ } } if(!$skip) { - $results[] = new OC_Search_Result($name, $text, $link, $type); + $results[] = new OC_Search_Result($name, $text, $link, $type, $container); } } return $results; diff --git a/lib/search/result.php b/lib/search/result.php index 08beaea151c..42275c2df11 100644 --- a/lib/search/result.php +++ b/lib/search/result.php @@ -7,6 +7,7 @@ class OC_Search_Result{ public $text; public $link; public $type; + public $container; /** * create a new search result @@ -15,10 +16,11 @@ class OC_Search_Result{ * @param string $link link for the result * @param string $type the type of result as human readable string ('File', 'Music', etc) */ - public function __construct($name, $text, $link, $type) { + public function __construct($name, $text, $link, $type, $container) { $this->name=$name; $this->text=$text; $this->link=$link; $this->type=$type; + $this->container=$container; } } diff --git a/search/css/results.css b/search/css/results.css index 4ae7d67afb3..8a32b0b995d 100644 --- a/search/css/results.css +++ b/search/css/results.css @@ -14,7 +14,7 @@ position:fixed; right:0; text-overflow:ellipsis; - top:20px; + top:45px; width:380px; z-index:75; } @@ -43,10 +43,16 @@ } #searchresults td { - vertical-align:top; padding:0 .3em; + height: 32px; +} +#searchresults tr.template { + display: none; } +#searchresults td.result { + width:250px; +} #searchresults td.result div.text { padding-left:1em; white-space:nowrap; @@ -56,6 +62,18 @@ cursor:pointer; } +#searchresults td.container { + width:20px; +} + +#searchresults td.container img { + vertical-align: middle; + display:none; +} +#searchresults tr:hover td.container img { + display:inline; +} + #searchresults td.type { border-bottom:none; border-right:1px solid #aaa; diff --git a/search/js/result.js b/search/js/result.js index 78fa8efc8e9..78d9149f220 100644 --- a/search/js/result.js +++ b/search/js/result.js @@ -8,15 +8,23 @@ OC.search.catagorizeResults=function(results){ types[type].push(results[i]); } return types; -} +}; OC.search.hide=function(){ $('#searchresults').hide(); if($('#searchbox').val().length>2){ $('#searchbox').val(''); + if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system + FileList.unfilter(); + } }; -} + if ($('#searchbox').val().length === 0) { + if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system + FileList.unfilter(); + } + } +}; OC.search.showResults=function(results){ - if(results.length==0){ + if(results.length === 0){ return; } if(!OC.search.showResults.loaded){ @@ -30,6 +38,9 @@ OC.search.showResults=function(results){ }); $(document).click(function(event){ OC.search.hide(); + if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system + FileList.unfilter(); + } }); OC.search.lastResults=results; OC.search.showResults(results); @@ -46,12 +57,27 @@ OC.search.showResults=function(results){ var row=$('#searchresults tr.template').clone(); row.removeClass('template'); row.addClass('result'); - if (i == 0){ + if (i === 0){ row.children('td.type').text(name); } row.find('td.result a').attr('href',type[i].link); row.find('td.result div.name').text(type[i].name); row.find('td.result div.text').text(type[i].text); + if (type[i].container) { + var td = row.find('td.container'); + td.append(''); + td.find('img').attr('src',OC.imagePath('core','places/folder')); + var containerName = OC.basename(type[i].container); + if (containerName === '') { + containerName = '/'; + } + var containerLink = OC.linkTo('files','index.php') + +'?dir='+encodeURIComponent(type[i].container) + +'&scrollto='+encodeURIComponent(type[i].name); + row.find('td.container a') + .attr('href',containerLink) + .attr('title',t('core','Show in {folder}',{folder: containerName})); + } row.data('index',index); index++; if(OC.search.customResults[name]){//give plugins the ability to customize the entries in here @@ -62,7 +88,7 @@ OC.search.showResults=function(results){ } } } -} +}; OC.search.showResults.loaded=false; OC.search.renderCurrent=function(){ @@ -71,4 +97,4 @@ OC.search.renderCurrent=function(){ $('#searchresults tr.result').removeClass('current'); $(result).addClass('current'); } -} +}; diff --git a/search/templates/part.results.php b/search/templates/part.results.php index 9e39a1c2c8b..1469e3468d3 100644 --- a/search/templates/part.results.php +++ b/search/templates/part.results.php @@ -1,7 +1,7 @@
      t('Username'))?>
      - + +
      @@ -9,6 +9,7 @@
      -- cgit v1.2.3 From 8b4f4a79e22dc08cf7c13a91c926c229676d6522 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 17 Sep 2013 19:46:08 +0200 Subject: Still some session leftovers. --- lib/appframework/controller/controller.php | 10 ---------- tests/lib/appframework/controller/ControllerTest.php | 5 ----- 2 files changed, 15 deletions(-) (limited to 'lib') diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php index a7498ba0e1e..0ea0a38cc09 100644 --- a/lib/appframework/controller/controller.php +++ b/lib/appframework/controller/controller.php @@ -106,16 +106,6 @@ abstract class Controller { } - /** - * Shortcut for getting session variables - * @param string $key the key that will be taken from the $_SESSION array - * @return array the value in the $_SESSION element - */ - public function session($key) { - return $this->request->getSession($key); - } - - /** * Shortcut for getting cookie variables * @param string $key the key that will be taken from the $_COOKIE array diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php index 246371d249c..4441bddfca9 100644 --- a/tests/lib/appframework/controller/ControllerTest.php +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -152,9 +152,4 @@ class ControllerTest extends \PHPUnit_Framework_TestCase { $this->assertEquals('daheim', $this->controller->env('PATH')); } - public function testGetSessionVariable(){ - $this->assertEquals('kein', $this->controller->session('sezession')); - } - - } -- cgit v1.2.3 From b0762ad3bf5121ccd300ec6c22641c3bf323ba61 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 00:37:00 +0200 Subject: OC_VCategories=>OC\Tags. Public interface + getter in server container --- lib/public/iservercontainer.php | 7 + lib/public/itags.php | 173 +++++++++ lib/server.php | 12 + lib/tags.php | 621 ++++++++++++++++++++++++++++++ lib/vcategories.php | 833 ---------------------------------------- tests/lib/tags.php | 133 +++++++ tests/lib/vcategories.php | 128 ------ 7 files changed, 946 insertions(+), 961 deletions(-) create mode 100644 lib/public/itags.php create mode 100644 lib/tags.php delete mode 100644 lib/vcategories.php create mode 100644 tests/lib/tags.php delete mode 100644 tests/lib/vcategories.php (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index d88330698dc..e44acee6533 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -55,6 +55,13 @@ interface IServerContainer { */ function getPreviewManager(); + /** + * Returns the tag manager which can get and set tags for different object types + * + * @return \OCP\ITags + */ + function getTagManager(); + /** * Returns the root folder of ownCloud's data directory * diff --git a/lib/public/itags.php b/lib/public/itags.php new file mode 100644 index 00000000000..047d4f5f40b --- /dev/null +++ b/lib/public/itags.php @@ -0,0 +1,173 @@ + +* +* 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 . +* +*/ + +namespace OCP; + +// FIXME: Where should I put this? Or should it be implemented as a Listener? +\OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Tags', 'post_deleteUser'); + +/** + * Class for easily tagging objects by their id + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +interface ITags { + + /** + * Load tags from db. + * + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function loadTagsFor($type, $defaultTags=array()); + + /** + * Check if any tags are saved for this type and user. + * + * @return boolean. + */ + public function isEmpty(); + + /** + * Get the tags for a specific user. + * + * This returns an array with id/name maps: + * [ + * ['id' => 0, 'name' = 'First tag'], + * ['id' => 1, 'name' = 'Second tag'], + * ] + * + * @returns array + */ + public function tags(); + + /** + * Get the a list if items tagged with $tag. + * + * Throws an exception if the tag could not be found. + * + * @param string|integer $tag Tag id or name. + * @return array An array of object ids or false on error. + */ + public function idsForTag($tag); + + /** + * Checks whether a tag is already saved. + * + * @param string $name The name to check for. + * @return bool + */ + public function hasTag($name); + + /** + * Add a new tag. + * + * @param string $name A string with a name of the tag + * @return int the id of the added tag or false if it already exists. + */ + public function add($name); + + /** + * Rename tag. + * + * @param string $from The name of the existing tag + * @param string $to The new name of the tag. + * @return bool + */ + public function rename($from, $to); + + /** + * Add a list of new tags. + * + * @param string[] $names A string with a name or an array of strings containing + * the name(s) of the to add. + * @param bool $sync When true, save the tags + * @param int|null $id int Optional object id to add to this|these tag(s) + * @return bool Returns false on error. + */ + public function addMulti($names, $sync=false, $id = null); + + /** + * Delete tag/object relations from the db + * + * @param array $ids The ids of the objects + * @return boolean Returns false on error. + */ + public function purgeObjects(array $ids); + + /** + * Get favorites for an object type + * + * @return array An array of object ids. + */ + public function getFavorites(); + + /** + * Add an object to favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function addToFavorites($objid); + + /** + * Remove an object from favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function removeFromFavorites($objid); + + /** + * Creates a tag/object relation. + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean Returns false on database error. + */ + public function tagAs($objid, $tag); + + /** + * Delete single tag/object relation from the db + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean + */ + public function unTag($objid, $tag); + + /** + * Delete tags from the + * + * @param string[] $names An array of tags to delete + * @return bool Returns false on error + */ + public function delete($names); + +} \ No newline at end of file diff --git a/lib/server.php b/lib/server.php index 9e87bd3190d..f25216b746d 100644 --- a/lib/server.php +++ b/lib/server.php @@ -49,6 +49,9 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('PreviewManager', function($c){ return new PreviewManager(); }); + $this->registerService('TagManager', function($c){ + return new Tags(); + }); $this->registerService('RootFolder', function($c){ // TODO: get user and user manager from container as well $user = \OC_User::getUser(); @@ -88,6 +91,15 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('PreviewManager'); } + /** + * Returns the tag manager which can get and set tags for different object types + * + * @return \OCP\ITags + */ + function getTagManager() { + return $this->query('TagManager'); + } + /** * Returns the root folder of ownCloud's data directory * diff --git a/lib/tags.php b/lib/tags.php new file mode 100644 index 00000000000..4aafff8e1bb --- /dev/null +++ b/lib/tags.php @@ -0,0 +1,621 @@ + +* @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 for easily tagging objects by their id + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +namespace OC; + +class Tags implements \OCP\ITags { + + /** + * Tags + */ + private $tags = array(); + + /** + * Used for storing objectid/categoryname pairs while rescanning. + */ + private static $relations = array(); + + private $type = null; + private $user = null; + + const TAG_TABLE = '*PREFIX*vcategory'; + const RELATION_TABLE = '*PREFIX*vcategory_to_object'; + + const TAG_FAVORITE = '_$!!$_'; + + /** + * Constructor. + * + * @param string $user The user whos data the object will operate on. + */ + public function __construct($user) { + + $this->user = $user; + + } + + /** + * Load tags from db. + * + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function loadTagsFor($type, $defaultTags=array()) { + $this->type = $type; + $this->tags = array(); + $result = null; + $sql = 'SELECT `id`, `category` FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`'; + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($this->user, $this->type)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + + if(!is_null($result)) { + while( $row = $result->fetchRow()) { + $this->tags[$row['id']] = $row['category']; + } + } + + if(count($defaultTags) > 0 && count($this->tags) === 0) { + $this->addMulti($defaultTags, true); + } + \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true), + \OCP\Util::DEBUG); + + return $this; + } + + /** + * Check if any tags are saved for this type and user. + * + * @return boolean. + */ + public function isEmpty() { + $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ? AND `type` = ?'; + try { + $stmt = OCP\DB::prepare($sql); + $result = $stmt->execute(array($this->user, $this->type)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + return ($result->numRows() === 0); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + } + + /** + * Get the tags for a specific user. + * + * This returns an array with id/name maps: + * [ + * ['id' => 0, 'name' = 'First tag'], + * ['id' => 1, 'name' = 'Second tag'], + * ] + * + * @return array + */ + public function tags() { + if(!count($this->tags)) { + return array(); + } + + $tags = array_values($this->tags); + uasort($tags, 'strnatcasecmp'); + $tagMap = array(); + + foreach($tags as $tag) { + if($tag !== self::TAG_FAVORITE) { + $tagMap[] = array( + 'id' => $this->array_searchi($tag, $this->tags), + 'name' => $tag + ); + } + } + return $tagMap; + + } + + /** + * Get the a list if items tagged with $tag. + * + * Throws an exception if the tag could not be found. + * + * @param string|integer $tag Tag id or name. + * @return array An array of object ids or false on error. + */ + public function idsForTag($tag) { + $result = null; + if(is_numeric($tag)) { + $tagId = $tag; + } elseif(is_string($tag)) { + $tag = trim($tag); + $tagId = $this->array_searchi($tag, $this->tags); + } + + if($tagId === false) { + $l10n = \OC_L10N::get('core'); + throw new \Exception( + $l10n->t('Could not find category "%s"', $tag) + ); + } + + $ids = array(); + $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE + . '` WHERE `categoryid` = ?'; + + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($tagId)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + + if(!is_null($result)) { + while( $row = $result->fetchRow()) { + $ids[] = (int)$row['objid']; + } + } + + return $ids; + } + + /** + * Checks whether a tag is already saved. + * + * @param string $name The name to check for. + * @return bool + */ + public function hasTag($name) { + return $this->in_arrayi($name, $this->tags); + } + + /** + * Add a new tag. + * + * @param string $name A string with a name of the tag + * @return int the id of the added tag or false if it already exists. + */ + public function add($name) { + $name = trim($name); + + if($this->hasTag($name)) { + \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG); + return false; + } + try { + \OCP\DB::insertIfNotExist(self::TAG_TABLE, + array( + 'uid' => $this->user, + 'type' => $this->type, + 'category' => $name, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + $id = \OCP\DB::insertid(self::TAG_TABLE); + \OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG); + $this->tags[$id] = $name; + return $id; + } + + /** + * Rename tag. + * + * @param string $from The name of the existing tag + * @param string $to The new name of the tag. + * @return bool + */ + public function rename($from, $to) { + $from = trim($from); + $to = trim($to); + $id = $this->array_searchi($from, $this->tags); + if($id === false) { + \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG); + return false; + } + + $sql = 'UPDATE `' . self::TAG_TABLE . '` SET `category` = ? ' + . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?'; + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($to, $this->user, $this->type, $id)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + $this->tags[$id] = $to; + return true; + } + + /** + * Add a list of new tags. + * + * @param string[] $names A string with a name or an array of strings containing + * the name(s) of the to add. + * @param bool $sync When true, save the tags + * @param int|null $id int Optional object id to add to this|these tag(s) + * @return bool Returns false on error. + */ + public function addMulti($names, $sync=false, $id = null) { + if(!is_array($names)) { + $names = array($names); + } + $names = array_map('trim', $names); + $newones = array(); + foreach($names as $name) { + if(($this->in_arrayi( + $name, $this->tags) == false) && $name !== '') { + $newones[] = $name; + } + if(!is_null($id) ) { + // Insert $objectid, $categoryid pairs if not exist. + self::$relations[] = array('objid' => $id, 'tag' => $name); + } + } + $this->tags = array_merge($this->tags, $newones); + if($sync === true) { + $this->save(); + } + + return true; + } + + /** + * Save the list of tags and their object relations + */ + protected function save() { + if(is_array($this->tags)) { + foreach($this->tags as $tag) { + try { + \OCP\DB::insertIfNotExist(self::TAG_TABLE, + array( + 'uid' => $this->user, + 'type' => $this->type, + 'category' => $tag, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + // reload tags to get the proper ids. + $this->loadTagsFor($this->type); + // Loop through temporarily cached objectid/tagname pairs + // and save relations. + $tags = $this->tags; + // For some reason this is needed or array_search(i) will return 0..? + ksort($tags); + foreach(self::$relations as $relation) { + $tagId = $this->array_searchi($relation['tag'], $tags); + \OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG); + if($tagId) { + try { + \OCP\DB::insertIfNotExist(self::RELATION_TABLE, + array( + 'objid' => $relation['objid'], + 'categoryid' => $tagId, + 'type' => $this->type, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + } + self::$relations = array(); // reset + } else { + \OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! ' + . print_r($this->tags, true), \OCP\Util::ERROR); + } + } + + /** + * Delete tags and tag/object relations for a user. + * + * For hooking up on post_deleteUser + * + * @param array + */ + public static function post_deleteUser($arguments) { + // Find all objectid/tagId pairs. + $result = null; + try { + $stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ?'); + $result = $stmt->execute(array($arguments['uid'])); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + + if(!is_null($result)) { + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `categoryid` = ?'); + while( $row = $result->fetchRow()) { + try { + $stmt->execute(array($row['id'])); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ?'); + $result = $stmt->execute(array($arguments['uid'])); + if (OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), OCP\Util::ERROR); + } + } + + /** + * Delete tag/object relations from the db + * + * @param array $ids The ids of the objects + * @return boolean Returns false on error. + */ + public function purgeObjects(array $ids) { + if(count($ids) === 0) { + // job done ;) + return true; + } + $updates = $ids; + try { + $query = 'DELETE FROM `' . self::RELATION_TABLE . '` '; + $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; + $query .= 'AND `type`= ?'; + $updates[] = $this->type; + $stmt = OCP\DB::prepare($query); + $result = $stmt->execute($updates); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Get favorites for an object type + * + * @return array An array of object ids. + */ + public function getFavorites() { + try { + return $this->idsForTag(self::TAG_FAVORITE); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), + \OCP\Util::ERROR); + return array(); + } + } + + /** + * Add an object to favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function addToFavorites($objid) { + if(!$this->hasCategory(self::TAG_FAVORITE)) { + $this->add(self::TAG_FAVORITE, true); + } + return $this->tagAs($objid, self::TAG_FAVORITE, $this->type); + } + + /** + * Remove an object from favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function removeFromFavorites($objid) { + return $this->unTag($objid, self::TAG_FAVORITE, $this->type); + } + + /** + * Creates a tag/object relation. + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean Returns false on database error. + */ + public function tagAs($objid, $tag) { + if(is_string($tag) && !is_numeric($tag)) { + $tag = trim($tag); + if(!$this->hasTag($tag)) { + $this->add($tag, true); + } + $tagId = $this->array_searchi($tag, $this->tags); + } else { + $tagId = $tag; + } + try { + \OCP\DB::insertIfNotExist(self::RELATION_TABLE, + array( + 'objid' => $objid, + 'categoryid' => $tagId, + 'type' => $this->type, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Delete single tag/object relation from the db + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean + */ + public function unTag($objid, $tag) { + if(is_string($tag) && !is_numeric($tag)) { + $tag = trim($tag); + $tagId = $this->array_searchi($tag, $this->tags); + } else { + $tagId = $tag; + } + + try { + $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; + $stmt = \OCP\DB::prepare($sql); + $stmt->execute(array($objid, $tagId, $this->type)); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Delete tags from the + * + * @param string[] $names An array of tags to delete + * @return bool Returns false on error + */ + public function delete($names) { + if(!is_array($names)) { + $names = array($names); + } + + $names = array_map('trim', $names); + + \OCP\Util::writeLog('core', __METHOD__ . ', before: ' + . print_r($this->tags, true), \OCP\Util::DEBUG); + foreach($names as $name) { + $id = null; + + if($this->hasTag($name)) { + $id = $this->array_searchi($name, $this->tags); + unset($this->tags[$id]); + } + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` WHERE ' + . '`uid` = ? AND `type` = ? AND `category` = ?'); + $result = $stmt->execute(array($this->user, $this->type, $name)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), \OCP\Util::ERROR); + return false; + } + if(!is_null($id) && $id !== false) { + try { + $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `categoryid` = ?'; + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($id)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', + __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), + \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + } + } + return true; + } + + // case-insensitive in_array + private function in_arrayi($needle, $haystack) { + if(!is_array($haystack)) { + return false; + } + return in_array(strtolower($needle), array_map('strtolower', $haystack)); + } + + // case-insensitive array_search + private function array_searchi($needle, $haystack) { + if(!is_array($haystack)) { + return false; + } + return array_search(strtolower($needle), array_map('strtolower', $haystack)); + } +} diff --git a/lib/vcategories.php b/lib/vcategories.php deleted file mode 100644 index a7e4c54be29..00000000000 --- a/lib/vcategories.php +++ /dev/null @@ -1,833 +0,0 @@ - -* @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 . -* -*/ - -OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_VCategories', 'post_deleteUser'); - -/** - * Class for easy access to categories in VCARD, VEVENT, VTODO and VJOURNAL. - * A Category can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or - * anything else that is either parsed from a vobject or that the user chooses - * to add. - * Category names are not case-sensitive, but will be saved with the case they - * are entered in. If a user already has a category 'family' for a type, and - * tries to add a category named 'Family' it will be silently ignored. - */ -class OC_VCategories { - - /** - * Categories - */ - private $categories = array(); - - /** - * Used for storing objectid/categoryname pairs while rescanning. - */ - private static $relations = array(); - - private $type = null; - private $user = null; - - const CATEGORY_TABLE = '*PREFIX*vcategory'; - const RELATION_TABLE = '*PREFIX*vcategory_to_object'; - - const CATEGORY_FAVORITE = '_$!!$_'; - - const FORMAT_LIST = 0; - const FORMAT_MAP = 1; - - /** - * @brief Constructor. - * @param $type The type identifier e.g. 'contact' or 'event'. - * @param $user The user whos data the object will operate on. This - * parameter should normally be omitted but to make an app able to - * update categories for all users it is made possible to provide it. - * @param $defcategories An array of default categories to be used if none is stored. - */ - public function __construct($type, $user=null, $defcategories=array()) { - $this->type = $type; - $this->user = is_null($user) ? OC_User::getUser() : $user; - - $this->loadCategories(); - OCP\Util::writeLog('core', __METHOD__ . ', categories: ' - . print_r($this->categories, true), - OCP\Util::DEBUG - ); - - if($defcategories && count($this->categories) === 0) { - $this->addMulti($defcategories, true); - } - } - - /** - * @brief Load categories from db. - */ - private function loadCategories() { - $this->categories = array(); - $result = null; - $sql = 'SELECT `id`, `category` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - // The keys are prefixed because array_search wouldn't work otherwise :-/ - $this->categories[$row['id']] = $row['category']; - } - } - OCP\Util::writeLog('core', __METHOD__.', categories: ' . print_r($this->categories, true), - OCP\Util::DEBUG); - } - - - /** - * @brief Check if any categories are saved for this type and user. - * @returns boolean. - * @param $type The type identifier e.g. 'contact' or 'event'. - * @param $user The user whos categories will be checked. If not set current user will be used. - */ - public static function isEmpty($type, $user = null) { - $user = is_null($user) ? OC_User::getUser() : $user; - $sql = 'SELECT COUNT(*) FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($user, $type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - return ($result->numRows() === 0); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - } - - /** - * @brief Get the categories for a specific user. - * @param - * @returns array containing the categories as strings. - */ - public function categories($format = null) { - if(!$this->categories) { - return array(); - } - $categories = array_values($this->categories); - uasort($categories, 'strnatcasecmp'); - if($format == self::FORMAT_MAP) { - $catmap = array(); - foreach($categories as $category) { - if($category !== self::CATEGORY_FAVORITE) { - $catmap[] = array( - 'id' => $this->array_searchi($category, $this->categories), - 'name' => $category - ); - } - } - return $catmap; - } - - // Don't add favorites to normal categories. - $favpos = array_search(self::CATEGORY_FAVORITE, $categories); - if($favpos !== false) { - return array_splice($categories, $favpos); - } else { - return $categories; - } - } - - /** - * Get the a list if items belonging to $category. - * - * Throws an exception if the category could not be found. - * - * @param string|integer $category Category id or name. - * @returns array An array of object ids or false on error. - */ - public function idsForCategory($category) { - $result = null; - if(is_numeric($category)) { - $catid = $category; - } elseif(is_string($category)) { - $category = trim($category); - $catid = $this->array_searchi($category, $this->categories); - } - OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); - if($catid === false) { - $l10n = OC_L10N::get('core'); - throw new Exception( - $l10n->t('Could not find category "%s"', $category) - ); - } - - $ids = array(); - $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE - . '` WHERE `categoryid` = ?'; - - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($catid)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - $ids[] = (int)$row['objid']; - } - } - - return $ids; - } - - /** - * Get the a list if items belonging to $category. - * - * Throws an exception if the category could not be found. - * - * @param string|integer $category Category id or name. - * @param array $tableinfo Array in the form {'tablename' => table, 'fields' => ['field1', 'field2']} - * @param int $limit - * @param int $offset - * - * This generic method queries a table assuming that the id - * field is called 'id' and the table name provided is in - * the form '*PREFIX*table_name'. - * - * If the category name cannot be resolved an exception is thrown. - * - * TODO: Maybe add the getting permissions for objects? - * - * @returns array containing the resulting items or false on error. - */ - public function itemsForCategory($category, $tableinfo, $limit = null, $offset = null) { - $result = null; - if(is_numeric($category)) { - $catid = $category; - } elseif(is_string($category)) { - $category = trim($category); - $catid = $this->array_searchi($category, $this->categories); - } - OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); - if($catid === false) { - $l10n = OC_L10N::get('core'); - throw new Exception( - $l10n->t('Could not find category "%s"', $category) - ); - } - $fields = ''; - foreach($tableinfo['fields'] as $field) { - $fields .= '`' . $tableinfo['tablename'] . '`.`' . $field . '`,'; - } - $fields = substr($fields, 0, -1); - - $items = array(); - $sql = 'SELECT `' . self::RELATION_TABLE . '`.`categoryid`, ' . $fields - . ' FROM `' . $tableinfo['tablename'] . '` JOIN `' - . self::RELATION_TABLE . '` ON `' . $tableinfo['tablename'] - . '`.`id` = `' . self::RELATION_TABLE . '`.`objid` WHERE `' - . self::RELATION_TABLE . '`.`categoryid` = ?'; - - try { - $stmt = OCP\DB::prepare($sql, $limit, $offset); - $result = $stmt->execute(array($catid)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - $items[] = $row; - } - } - //OCP\Util::writeLog('core', __METHOD__.', count: ' . count($items), OCP\Util::DEBUG); - //OCP\Util::writeLog('core', __METHOD__.', sql: ' . $sql, OCP\Util::DEBUG); - - return $items; - } - - /** - * @brief Checks whether a category is already saved. - * @param $name The name to check for. - * @returns bool - */ - public function hasCategory($name) { - return $this->in_arrayi($name, $this->categories); - } - - /** - * @brief Add a new category. - * @param $name A string with a name of the category - * @returns int the id of the added category or false if it already exists. - */ - public function add($name) { - $name = trim($name); - OCP\Util::writeLog('core', __METHOD__.', name: ' . $name, OCP\Util::DEBUG); - if($this->hasCategory($name)) { - OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG); - return false; - } - try { - OCP\DB::insertIfNotExist(self::CATEGORY_TABLE, - array( - 'uid' => $this->user, - 'type' => $this->type, - 'category' => $name, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - $id = OCP\DB::insertid(self::CATEGORY_TABLE); - OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, OCP\Util::DEBUG); - $this->categories[$id] = $name; - return $id; - } - - /** - * @brief Rename category. - * @param string $from The name of the existing category - * @param string $to The new name of the category. - * @returns bool - */ - public function rename($from, $to) { - $from = trim($from); - $to = trim($to); - $id = $this->array_searchi($from, $this->categories); - if($id === false) { - OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG); - return false; - } - - $sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? ' - . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($to, $this->user, $this->type, $id)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - $this->categories[$id] = $to; - return true; - } - - /** - * @brief Add a new category. - * @param $names A string with a name or an array of strings containing - * the name(s) of the categor(y|ies) to add. - * @param $sync bool When true, save the categories - * @param $id int Optional object id to add to this|these categor(y|ies) - * @returns bool Returns false on error. - */ - public function addMulti($names, $sync=false, $id = null) { - if(!is_array($names)) { - $names = array($names); - } - $names = array_map('trim', $names); - $newones = array(); - foreach($names as $name) { - if(($this->in_arrayi( - $name, $this->categories) == false) && $name != '') { - $newones[] = $name; - } - if(!is_null($id) ) { - // Insert $objectid, $categoryid pairs if not exist. - self::$relations[] = array('objid' => $id, 'category' => $name); - } - } - $this->categories = array_merge($this->categories, $newones); - if($sync === true) { - $this->save(); - } - - return true; - } - - /** - * @brief Extracts categories from a vobject and add the ones not already present. - * @param $vobject The instance of OC_VObject to load the categories from. - */ - public function loadFromVObject($id, $vobject, $sync=false) { - $this->addMulti($vobject->getAsArray('CATEGORIES'), $sync, $id); - } - - /** - * @brief Reset saved categories and rescan supplied vobjects for categories. - * @param $objects An array of vobjects (as text). - * To get the object array, do something like: - * // For Addressbook: - * $categories = new OC_VCategories('contacts'); - * $stmt = OC_DB::prepare( 'SELECT `carddata` FROM `*PREFIX*contacts_cards`' ); - * $result = $stmt->execute(); - * $objects = array(); - * if(!is_null($result)) { - * while( $row = $result->fetchRow()){ - * $objects[] = array($row['id'], $row['carddata']); - * } - * } - * $categories->rescan($objects); - */ - public function rescan($objects, $sync=true, $reset=true) { - - if($reset === true) { - $result = null; - // Find all objectid/categoryid pairs. - try { - $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - // And delete them. - if(!is_null($result)) { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ? AND `type`= ?'); - while( $row = $result->fetchRow()) { - $stmt->execute(array($row['id'], $this->type)); - } - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - return; - } - $this->categories = array(); - } - // Parse all the VObjects - foreach($objects as $object) { - $vobject = OC_VObject::parse($object[1]); - if(!is_null($vobject)) { - // Load the categories - $this->loadFromVObject($object[0], $vobject, $sync); - } else { - OC_Log::write('core', __METHOD__ . ', unable to parse. ID: ' . ', ' - . substr($object, 0, 100) . '(...)', OC_Log::DEBUG); - } - } - $this->save(); - } - - /** - * @brief Save the list with categories - */ - private function save() { - if(is_array($this->categories)) { - foreach($this->categories as $category) { - try { - OCP\DB::insertIfNotExist(self::CATEGORY_TABLE, - array( - 'uid' => $this->user, - 'type' => $this->type, - 'category' => $category, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - // reload categories to get the proper ids. - $this->loadCategories(); - // Loop through temporarily cached objectid/categoryname pairs - // and save relations. - $categories = $this->categories; - // For some reason this is needed or array_search(i) will return 0..? - ksort($categories); - foreach(self::$relations as $relation) { - $catid = $this->array_searchi($relation['category'], $categories); - OC_Log::write('core', __METHOD__ . 'catid, ' . $relation['category'] . ' ' . $catid, OC_Log::DEBUG); - if($catid) { - try { - OCP\DB::insertIfNotExist(self::RELATION_TABLE, - array( - 'objid' => $relation['objid'], - 'categoryid' => $catid, - 'type' => $this->type, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - } - self::$relations = array(); // reset - } else { - OC_Log::write('core', __METHOD__.', $this->categories is not an array! ' - . print_r($this->categories, true), OC_Log::ERROR); - } - } - - /** - * @brief Delete categories and category/object relations for a user. - * For hooking up on post_deleteUser - * @param string $uid The user id for which entries should be purged. - */ - public static function post_deleteUser($arguments) { - // Find all objectid/categoryid pairs. - $result = null; - try { - $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ?'); - $result = $stmt->execute(array($arguments['uid'])); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - if(!is_null($result)) { - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ?'); - while( $row = $result->fetchRow()) { - try { - $stmt->execute(array($row['id'])); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ?'); - $result = $stmt->execute(array($arguments['uid'])); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - } - } - - /** - * @brief Delete category/object relations from the db - * @param array $ids The ids of the objects - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean Returns false on error. - */ - public function purgeObjects(array $ids, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(count($ids) === 0) { - // job done ;) - return true; - } - $updates = $ids; - try { - $query = 'DELETE FROM `' . self::RELATION_TABLE . '` '; - $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; - $query .= 'AND `type`= ?'; - $updates[] = $type; - $stmt = OCP\DB::prepare($query); - $result = $stmt->execute($updates); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * Get favorites for an object type - * - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns array An array of object ids. - */ - public function getFavorites($type = null) { - $type = is_null($type) ? $this->type : $type; - - try { - return $this->idsForCategory(self::CATEGORY_FAVORITE); - } catch(Exception $e) { - // No favorites - return array(); - } - } - - /** - * Add an object to favorites - * - * @param int $objid The id of the object - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function addToFavorites($objid, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(!$this->hasCategory(self::CATEGORY_FAVORITE)) { - $this->add(self::CATEGORY_FAVORITE, true); - } - return $this->addToCategory($objid, self::CATEGORY_FAVORITE, $type); - } - - /** - * Remove an object from favorites - * - * @param int $objid The id of the object - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function removeFromFavorites($objid, $type = null) { - $type = is_null($type) ? $this->type : $type; - return $this->removeFromCategory($objid, self::CATEGORY_FAVORITE, $type); - } - - /** - * @brief Creates a category/object relation. - * @param int $objid The id of the object - * @param int|string $category The id or name of the category - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean Returns false on database error. - */ - public function addToCategory($objid, $category, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(is_string($category) && !is_numeric($category)) { - $category = trim($category); - if(!$this->hasCategory($category)) { - $this->add($category, true); - } - $categoryid = $this->array_searchi($category, $this->categories); - } else { - $categoryid = $category; - } - try { - OCP\DB::insertIfNotExist(self::RELATION_TABLE, - array( - 'objid' => $objid, - 'categoryid' => $categoryid, - 'type' => $type, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * @brief Delete single category/object relation from the db - * @param int $objid The id of the object - * @param int|string $category The id or name of the category - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function removeFromCategory($objid, $category, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(is_string($category) && !is_numeric($category)) { - $category = trim($category); - $categoryid = $this->array_searchi($category, $this->categories); - } else { - $categoryid = $category; - } - - try { - $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; - OCP\Util::writeLog('core', __METHOD__.', sql: ' . $objid . ' ' . $categoryid . ' ' . $type, - OCP\Util::DEBUG); - $stmt = OCP\DB::prepare($sql); - $stmt->execute(array($objid, $categoryid, $type)); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * @brief Delete categories from the db and from all the vobject supplied - * @param $names An array of categories to delete - * @param $objects An array of arrays with [id,vobject] (as text) pairs suitable for updating the apps object table. - */ - public function delete($names, array &$objects=null) { - if(!is_array($names)) { - $names = array($names); - } - - $names = array_map('trim', $names); - - OC_Log::write('core', __METHOD__ . ', before: ' - . print_r($this->categories, true), OC_Log::DEBUG); - foreach($names as $name) { - $id = null; - OC_Log::write('core', __METHOD__.', '.$name, OC_Log::DEBUG); - if($this->hasCategory($name)) { - $id = $this->array_searchi($name, $this->categories); - unset($this->categories[$id]); - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` WHERE ' - . '`uid` = ? AND `type` = ? AND `category` = ?'); - $result = $stmt->execute(array($this->user, $this->type, $name)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - } - if(!is_null($id) && $id !== false) { - try { - $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ?'; - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($id)); - if (OC_DB::isError($result)) { - OC_Log::write('core', - __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), - OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - } - } - OC_Log::write('core', __METHOD__.', after: ' - . print_r($this->categories, true), OC_Log::DEBUG); - if(!is_null($objects)) { - foreach($objects as $key=>&$value) { - $vobject = OC_VObject::parse($value[1]); - if(!is_null($vobject)) { - $object = null; - $componentname = ''; - if (isset($vobject->VEVENT)) { - $object = $vobject->VEVENT; - $componentname = 'VEVENT'; - } else - if (isset($vobject->VTODO)) { - $object = $vobject->VTODO; - $componentname = 'VTODO'; - } else - if (isset($vobject->VJOURNAL)) { - $object = $vobject->VJOURNAL; - $componentname = 'VJOURNAL'; - } else { - $object = $vobject; - } - $categories = $object->getAsArray('CATEGORIES'); - foreach($names as $name) { - $idx = $this->array_searchi($name, $categories); - if($idx !== false) { - OC_Log::write('core', __METHOD__ - .', unsetting: ' - . $categories[$this->array_searchi($name, $categories)], - OC_Log::DEBUG); - unset($categories[$this->array_searchi($name, $categories)]); - } - } - - $object->setString('CATEGORIES', implode(',', $categories)); - if($vobject !== $object) { - $vobject[$componentname] = $object; - } - $value[1] = $vobject->serialize(); - $objects[$key] = $value; - } else { - OC_Log::write('core', __METHOD__ - .', unable to parse. ID: ' . $value[0] . ', ' - . substr($value[1], 0, 50) . '(...)', OC_Log::DEBUG); - } - } - } - } - - // case-insensitive in_array - private function in_arrayi($needle, $haystack) { - if(!is_array($haystack)) { - return false; - } - return in_array(strtolower($needle), array_map('strtolower', $haystack)); - } - - // case-insensitive array_search - private function array_searchi($needle, $haystack) { - if(!is_array($haystack)) { - return false; - } - return array_search(strtolower($needle), array_map('strtolower', $haystack)); - } -} diff --git a/tests/lib/tags.php b/tests/lib/tags.php new file mode 100644 index 00000000000..06baebc0af7 --- /dev/null +++ b/tests/lib/tags.php @@ -0,0 +1,133 @@ +. +* +*/ + +class Test_Tags extends PHPUnit_Framework_TestCase { + + protected $objectType; + protected $user; + protected $backupGlobals = FALSE; + + public function setUp() { + + OC_User::clearBackends(); + OC_User::useBackend('dummy'); + $this->user = uniqid('user_'); + $this->objectType = uniqid('type_'); + OC_User::createUser($this->user, 'pass'); + OC_User::setUserId($this->user); + + } + + public function tearDown() { + //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?'); + //$query->execute(array('test')); + } + + public function testInstantiateWithDefaults() { + $defaultTags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertEquals(4, count($tagMgr->tags())); + } + + public function testAddTags() { + $tags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($tags as $tag) { + $result = $tagMgr->add($tag); + $this->assertTrue((bool)$result); + } + + $this->assertFalse($tagMgr->add('Family')); + $this->assertFalse($tagMgr->add('fAMILY')); + + $this->assertEquals(4, count($tagMgr->tags())); + } + + public function testdeleteTags() { + $defaultTags = array('Friends', 'Family', 'Work', 'Other'); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertEquals(4, count($tagMgr->tags())); + + $tagMgr->delete('family'); + $this->assertEquals(3, count($tagMgr->tags())); + + $tagMgr->delete(array('Friends', 'Work', 'Other')); + $this->assertEquals(0, count($tagMgr->tags())); + + } + + public function testRenameTag() { + $defaultTags = array('Friends', 'Family', 'Wrok', 'Other'); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertTrue($tagMgr->rename('Wrok', 'Work')); + $this->assertTrue($tagMgr->hasTag('Work')); + $this->assertFalse($tagMgr->hastag('Wrok')); + $this->assertFalse($tagMgr->rename('Wrok', 'Work')); + + } + + public function testTagAs() { + $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($objids as $id) { + $tagMgr->tagAs($id, 'Family'); + } + + $this->assertEquals(1, count($tagMgr->tags())); + $this->assertEquals(9, count($tagMgr->idsForTag('Family'))); + } + + /** + * @depends testTagAs + */ + public function testUnTag() { + $objIds = array(1, 2, 3, 4, 5, 6, 7, 8, 9); + + // Is this "legal"? + $this->testTagAs(); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($objIds as $id) { + $this->assertTrue(in_array($id, $tagMgr->idsForTag('Family'))); + $tagMgr->unTag($id, 'Family'); + $this->assertFalse(in_array($id, $tagMgr->idsForTag('Family'))); + } + + $this->assertEquals(1, count($tagMgr->tags())); + $this->assertEquals(0, count($tagMgr->idsForTag('Family'))); + } + +} diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php deleted file mode 100644 index df5f600f20d..00000000000 --- a/tests/lib/vcategories.php +++ /dev/null @@ -1,128 +0,0 @@ -. -* -*/ - -//require_once("../lib/template.php"); - -class Test_VCategories extends PHPUnit_Framework_TestCase { - - protected $objectType; - protected $user; - protected $backupGlobals = FALSE; - - public function setUp() { - - OC_User::clearBackends(); - OC_User::useBackend('dummy'); - $this->user = uniqid('user_'); - $this->objectType = uniqid('type_'); - OC_User::createUser($this->user, 'pass'); - OC_User::setUserId($this->user); - - } - - public function tearDown() { - //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?'); - //$query->execute(array('test')); - } - - public function testInstantiateWithDefaults() { - $defcategories = array('Friends', 'Family', 'Work', 'Other'); - - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - - $this->assertEquals(4, count($catmgr->categories())); - } - - public function testAddCategories() { - $categories = array('Friends', 'Family', 'Work', 'Other'); - - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($categories as $category) { - $result = $catmgr->add($category); - $this->assertTrue((bool)$result); - } - - $this->assertFalse($catmgr->add('Family')); - $this->assertFalse($catmgr->add('fAMILY')); - - $this->assertEquals(4, count($catmgr->categories())); - } - - public function testdeleteCategories() { - $defcategories = array('Friends', 'Family', 'Work', 'Other'); - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - $this->assertEquals(4, count($catmgr->categories())); - - $catmgr->delete('family'); - $this->assertEquals(3, count($catmgr->categories())); - - $catmgr->delete(array('Friends', 'Work', 'Other')); - $this->assertEquals(0, count($catmgr->categories())); - - } - - public function testrenameCategory() { - $defcategories = array('Friends', 'Family', 'Wrok', 'Other'); - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - - $this->assertTrue($catmgr->rename('Wrok', 'Work')); - $this->assertTrue($catmgr->hasCategory('Work')); - $this->assertFalse($catmgr->hasCategory('Wrok')); - $this->assertFalse($catmgr->rename('Wrok', 'Work')); - - } - - public function testAddToCategory() { - $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); - - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($objids as $id) { - $catmgr->addToCategory($id, 'Family'); - } - - $this->assertEquals(1, count($catmgr->categories())); - $this->assertEquals(9, count($catmgr->idsForCategory('Family'))); - } - - /** - * @depends testAddToCategory - */ - public function testRemoveFromCategory() { - $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); - - // Is this "legal"? - $this->testAddToCategory(); - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($objids as $id) { - $this->assertTrue(in_array($id, $catmgr->idsForCategory('Family'))); - $catmgr->removeFromCategory($id, 'Family'); - $this->assertFalse(in_array($id, $catmgr->idsForCategory('Family'))); - } - - $this->assertEquals(1, count($catmgr->categories())); - $this->assertEquals(0, count($catmgr->idsForCategory('Family'))); - } - -} -- cgit v1.2.3 From 1a60aa2b6a15ae68a2a6998a72580c171b88f719 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 18 Sep 2013 11:49:02 +0200 Subject: only remember password if the user changes the permissions, otherwise the user disabled the password protection --- lib/public/share.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 9ab956d84b9..91c5c477c8d 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -106,22 +106,22 @@ class Share { } return false; } - + /** * @brief Prepare a path to be passed to DB as file_target * @return string Prepared path */ public static function prepFileTarget( $path ) { - + // Paths in DB are stored with leading slashes, so add one if necessary if ( substr( $path, 0, 1 ) !== '/' ) { - + $path = '/' . $path; - + } - + return $path; - + } /** @@ -256,7 +256,7 @@ class Share { return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections); } - + /** * @brief Get the item of item type shared with the current user by source * @param string Item type @@ -450,6 +450,7 @@ class Share { $uidOwner, self::FORMAT_NONE, null, 1)) { // remember old token $oldToken = $checkExists['token']; + $oldPermissions = $checkExists['permissions']; //delete the old share self::delete($checkExists['id']); } @@ -460,8 +461,11 @@ class Share { $hasher = new \PasswordHash(8, $forcePortable); $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', '')); } else { - // reuse the already set password - $shareWith = $checkExists['share_with']; + // reuse the already set password, but only if we change permissions + // otherwise the user disabled the password protection + if ($checkExists && (int)$permissions !== $oldPermissions) { + $shareWith = $checkExists['share_with']; + } } // Generate token -- cgit v1.2.3 From d3f88ceeb49b9b86d32124163b0cea82567a4911 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 12:01:01 +0200 Subject: Add some docs to the sessions interface. --- lib/public/isession.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/isession.php b/lib/public/isession.php index 5f9ce32f3b1..0a77b0c823b 100644 --- a/lib/public/isession.php +++ b/lib/public/isession.php @@ -10,34 +10,46 @@ namespace OCP; +/** + * Interface ISession + * + * wrap PHP's internal session handling into the ISession interface + */ interface ISession { + /** + * Set a value in the session + * * @param string $key * @param mixed $value */ public function set($key, $value); /** + * Get a value from the session + * * @param string $key * @return mixed should return null if $key does not exist */ public function get($key); /** + * Check if a named key exists in the session + * * @param string $key * @return bool */ public function exists($key); /** - * should not throw any errors if $key does not exist + * Remove a $key/$value pair from the session * * @param string $key */ public function remove($key); /** - * removes all entries within the cache namespace + * Reset and recreate the session */ public function clear(); -- cgit v1.2.3 From 6ba23912a7c969ce24a3b295c55a60ea640ca690 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 12:34:10 +0200 Subject: Add getUserFolder/getAppFolder to Server. --- lib/public/iservercontainer.php | 14 ++++++++++++++ lib/server.php | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index ec7212b306e..89e71db8d17 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -62,6 +62,20 @@ interface IServerContainer { */ function getRootFolder(); + /** + * Returns a view to ownCloud's files folder + * + * @return \OCP\Files\Folder + */ + function getUserFolder(); + + /** + * Returns an app-specific view in ownClouds data directory + * + * @return \OCP\Files\Folder + */ + function getAppFolder(); + /** * Returns the current session * diff --git a/lib/server.php b/lib/server.php index 0eee3e0f73a..9525fce9fd7 100644 --- a/lib/server.php +++ b/lib/server.php @@ -56,6 +56,17 @@ class Server extends SimpleContainer implements IServerContainer { $view = new View(); return new Root($manager, $view, $user); }); + $this->registerService('CustomFolder', function($c) { + $dir = $c['CustomFolderPath']; + $root = $this->getRootFolder(); + $folder = null; + if(!$root->nodeExists($dir)) { + $folder = $root->newFolder($dir); + } else { + $folder = $root->get($dir); + } + return $folder; + }); } /** @@ -97,6 +108,30 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('RootFolder'); } + /** + * Returns a view to ownCloud's files folder + * + * @return \OCP\Files\Folder + */ + function getUserFolder() { + + $this->registerParameter('CustomFolderPath', '/files'); + return $this->query('CustomFolder'); + + } + + /** + * Returns an app-specific view in ownClouds data directory + * + * @return \OCP\Files\Folder + */ + function getAppFolder() { + + $this->registerParameter('CustomFolderPath', '/' . \OC_App::getCurrentApp()); + return $this->query('CustomFolder'); + + } + /** * Returns the current session * -- cgit v1.2.3 From 442a2e074cea694ce0d361b5433eb5473be438e6 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 12:35:46 +0200 Subject: Update to adhere to the coding guidelines. --- lib/server.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 9525fce9fd7..6b1cb9c38d2 100644 --- a/lib/server.php +++ b/lib/server.php @@ -17,10 +17,10 @@ use OCP\IServerContainer; class Server extends SimpleContainer implements IServerContainer { function __construct() { - $this->registerService('ContactsManager', function($c){ + $this->registerService('ContactsManager', function($c) { return new ContactsManager(); }); - $this->registerService('Request', function($c){ + $this->registerService('Request', function($c) { $params = array(); // we json decode the body only in case of content type json @@ -45,10 +45,10 @@ class Server extends SimpleContainer implements IServerContainer { ) ); }); - $this->registerService('PreviewManager', function($c){ + $this->registerService('PreviewManager', function($c) { return new PreviewManager(); }); - $this->registerService('RootFolder', function($c){ + $this->registerService('RootFolder', function($c) { // TODO: get user and user manager from container as well $user = \OC_User::getUser(); $user = \OC_User::getManager()->get($user); @@ -83,8 +83,7 @@ class Server extends SimpleContainer implements IServerContainer { * * @return \OCP\IRequest|null */ - function getRequest() - { + function getRequest() { return $this->query('Request'); } @@ -93,8 +92,7 @@ class Server extends SimpleContainer implements IServerContainer { * * @return \OCP\IPreview */ - function getPreviewManager() - { + function getPreviewManager() { return $this->query('PreviewManager'); } @@ -103,8 +101,7 @@ class Server extends SimpleContainer implements IServerContainer { * * @return \OCP\Files\Folder */ - function getRootFolder() - { + function getRootFolder() { return $this->query('RootFolder'); } -- cgit v1.2.3 From 534933ee9bf6837fc75a389e4ed3aad4ffe1ab0f Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 13:15:38 +0200 Subject: Use new emitter system --- 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 520be11bc52..ce307b2bdd2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -568,7 +568,9 @@ class OC { } catch (Exception $e) { } - OC_Hook::connect('OC_User', 'post_login', 'OC\Cache\File', 'loginListener'); + // NOTE: This will be replaced to use OCP + $userSession = \OC_User::getUserSession(); + $userSession->listen('postLogin', array('OC\Cache\File', 'loginListener')) } } -- cgit v1.2.3 From 2ef0b58ff6434254510c8be9c940126883022d76 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 14:25:12 +0200 Subject: Don't try to be clever --- lib/server.php | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 6b1cb9c38d2..3454622425a 100644 --- a/lib/server.php +++ b/lib/server.php @@ -56,17 +56,6 @@ class Server extends SimpleContainer implements IServerContainer { $view = new View(); return new Root($manager, $view, $user); }); - $this->registerService('CustomFolder', function($c) { - $dir = $c['CustomFolderPath']; - $root = $this->getRootFolder(); - $folder = null; - if(!$root->nodeExists($dir)) { - $folder = $root->newFolder($dir); - } else { - $folder = $root->get($dir); - } - return $folder; - }); } /** @@ -112,8 +101,15 @@ class Server extends SimpleContainer implements IServerContainer { */ function getUserFolder() { - $this->registerParameter('CustomFolderPath', '/files'); - return $this->query('CustomFolder'); + $dir = '/files'; + $root = $this->getRootFolder(); + $folder = null; + if(!$root->nodeExists($dir)) { + $folder = $root->newFolder($dir); + } else { + $folder = $root->get($dir); + } + return $folder; } @@ -124,8 +120,15 @@ class Server extends SimpleContainer implements IServerContainer { */ function getAppFolder() { - $this->registerParameter('CustomFolderPath', '/' . \OC_App::getCurrentApp()); - return $this->query('CustomFolder'); + $dir = '/' . \OC_App::getCurrentApp(); + $root = $this->getRootFolder(); + $folder = null; + if(!$root->nodeExists($dir)) { + $folder = $root->newFolder($dir); + } else { + $folder = $root->get($dir); + } + return $folder; } -- cgit v1.2.3 From 79cd655920ae3346725539df2f443a66e51c5726 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 14:50:21 +0200 Subject: Note to self: Test before pushing!!! --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index ce307b2bdd2..fd31cfd9f29 100644 --- a/lib/base.php +++ b/lib/base.php @@ -570,7 +570,7 @@ class OC { } // NOTE: This will be replaced to use OCP $userSession = \OC_User::getUserSession(); - $userSession->listen('postLogin', array('OC\Cache\File', 'loginListener')) + $userSession->listen('postLogin', array('OC\Cache\File', 'loginListener')); } } -- cgit v1.2.3 From 09d043729a41a0e8966ed3bb81567ed1009a37b6 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 15:02:25 +0200 Subject: Note to self 2: Do as you preach. Test! --- lib/base.php | 2 +- lib/cache.php | 6 +++--- lib/cache/fileglobal.php | 2 +- lib/legacy/cache.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index fd31cfd9f29..0650361be91 100644 --- a/lib/base.php +++ b/lib/base.php @@ -570,7 +570,7 @@ class OC { } // NOTE: This will be replaced to use OCP $userSession = \OC_User::getUserSession(); - $userSession->listen('postLogin', array('OC\Cache\File', 'loginListener')); + $userSession->listen('postLogin', '\OC\Cache\File', 'loginListener'); } } diff --git a/lib/cache.php b/lib/cache.php index c99663a0ca5..a4fa8be710c 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -namespace OC\Cache; +namespace OC; class Cache { /** @@ -24,7 +24,7 @@ class Cache { */ static public function getGlobalCache() { if (!self::$global_cache) { - self::$global_cache = new FileGlobal(); + self::$global_cache = new Cache\FileGlobal(); } return self::$global_cache; } @@ -35,7 +35,7 @@ class Cache { */ static public function getUserCache() { if (!self::$user_cache) { - self::$user_cache = new File(); + self::$user_cache = new Cache\File(); } return self::$user_cache; } diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php index 9ca17402933..bd049bba4d0 100644 --- a/lib/cache/fileglobal.php +++ b/lib/cache/fileglobal.php @@ -10,7 +10,7 @@ namespace OC\Cache; class FileGlobal { static protected function getCacheDir() { - $cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/'; + $cache_dir = get_temp_dir().'/owncloud-' . \OC_Util::getInstanceId().'/'; if (!is_dir($cache_dir)) { mkdir($cache_dir); } diff --git a/lib/legacy/cache.php b/lib/legacy/cache.php index 83b214170f7..f915eb516b1 100644 --- a/lib/legacy/cache.php +++ b/lib/legacy/cache.php @@ -6,5 +6,5 @@ * See the COPYING-README file. */ -class Cache extends OC\Cache { +class OC_Cache extends \OC\Cache { } \ No newline at end of file -- cgit v1.2.3 From 6b1843d91b88ef0d928c683e1cc3f87a7f1b90ff Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 18 Sep 2013 11:50:02 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ach.php | 7 + apps/files/l10n/af_ZA.php | 7 + apps/files/l10n/be.php | 7 + apps/files/l10n/bs.php | 12 + apps/files/l10n/de_AT.php | 7 + apps/files/l10n/de_CH.php | 77 ++++ apps/files/l10n/en_GB.php | 78 ++++ apps/files/l10n/es_MX.php | 7 + apps/files/l10n/hi.php | 1 + apps/files/l10n/km.php | 7 + apps/files/l10n/kn.php | 7 + apps/files/l10n/ml_IN.php | 7 + apps/files/l10n/ne.php | 7 + apps/files/l10n/nqo.php | 7 + apps/files/l10n/pa.php | 17 + apps/files/l10n/sk.php | 7 + apps/files/l10n/sw_KE.php | 7 + apps/files_encryption/l10n/bs.php | 5 + apps/files_encryption/l10n/de_CH.php | 39 ++ apps/files_encryption/l10n/en_GB.php | 39 ++ apps/files_encryption/l10n/pa.php | 5 + apps/files_encryption/l10n/te.php | 5 + apps/files_external/l10n/de_CH.php | 28 ++ apps/files_external/l10n/en_GB.php | 28 ++ apps/files_external/l10n/pa.php | 6 + apps/files_sharing/l10n/de_CH.php | 19 + apps/files_sharing/l10n/en_GB.php | 19 + apps/files_sharing/l10n/hi.php | 3 +- apps/files_sharing/l10n/pa.php | 8 + apps/files_trashbin/l10n/ach.php | 6 + apps/files_trashbin/l10n/af_ZA.php | 6 + apps/files_trashbin/l10n/be.php | 6 + apps/files_trashbin/l10n/bs.php | 7 + apps/files_trashbin/l10n/de_AT.php | 6 + apps/files_trashbin/l10n/de_CH.php | 19 + apps/files_trashbin/l10n/en@pirate.php | 6 + apps/files_trashbin/l10n/en_GB.php | 19 + apps/files_trashbin/l10n/es_MX.php | 6 + apps/files_trashbin/l10n/hi.php | 7 + apps/files_trashbin/l10n/ka.php | 6 + apps/files_trashbin/l10n/km.php | 6 + apps/files_trashbin/l10n/kn.php | 6 + apps/files_trashbin/l10n/ml_IN.php | 6 + apps/files_trashbin/l10n/my_MM.php | 6 + apps/files_trashbin/l10n/ne.php | 6 + apps/files_trashbin/l10n/nqo.php | 6 + apps/files_trashbin/l10n/pa.php | 8 + apps/files_trashbin/l10n/sk.php | 6 + apps/files_trashbin/l10n/sw_KE.php | 6 + apps/files_versions/l10n/cy_GB.php | 5 + apps/files_versions/l10n/de_CH.php | 10 + apps/files_versions/l10n/en_GB.php | 10 + apps/files_versions/l10n/sq.php | 5 + apps/user_ldap/l10n/de_CH.php | 87 +++++ apps/user_ldap/l10n/en_GB.php | 87 +++++ apps/user_ldap/l10n/lt_LT.php | 44 +++ apps/user_ldap/l10n/pa.php | 6 + apps/user_webdavauth/l10n/de_CH.php | 7 + apps/user_webdavauth/l10n/en_GB.php | 7 + apps/user_webdavauth/l10n/fa.php | 5 + core/l10n/ca.php | 7 + core/l10n/cs_CZ.php | 7 + core/l10n/de.php | 7 + core/l10n/de_DE.php | 7 + core/l10n/en_GB.php | 7 + core/l10n/et_EE.php | 7 + core/l10n/fi_FI.php | 3 + core/l10n/gl.php | 7 + core/l10n/hi.php | 2 + core/l10n/it.php | 7 + core/l10n/ja_JP.php | 6 + core/l10n/lt_LT.php | 7 + core/l10n/nl.php | 13 + core/l10n/pa.php | 45 +++ core/l10n/pt_BR.php | 7 + l10n/ach/settings.po | 45 ++- l10n/af_ZA/settings.po | 45 ++- l10n/ar/settings.po | 45 ++- l10n/be/settings.po | 45 ++- l10n/bg_BG/settings.po | 45 ++- l10n/bn_BD/settings.po | 45 ++- l10n/bs/settings.po | 45 ++- l10n/ca/core.po | 20 +- l10n/ca/lib.po | 12 +- l10n/ca/settings.po | 61 ++- l10n/cs_CZ/core.po | 20 +- l10n/cs_CZ/lib.po | 12 +- l10n/cs_CZ/settings.po | 61 ++- l10n/cy_GB/settings.po | 45 ++- l10n/da/settings.po | 61 ++- l10n/de/core.po | 20 +- l10n/de/lib.po | 12 +- l10n/de/settings.po | 61 ++- l10n/de_AT/settings.po | 45 ++- l10n/de_CH/settings.po | 45 ++- l10n/de_DE/core.po | 20 +- l10n/de_DE/lib.po | 12 +- l10n/de_DE/settings.po | 61 ++- l10n/el/settings.po | 47 ++- l10n/en@pirate/settings.po | 45 ++- l10n/en_GB/core.po | 20 +- l10n/en_GB/lib.po | 20 +- l10n/en_GB/settings.po | 61 ++- l10n/eo/settings.po | 47 ++- l10n/es/settings.po | 49 ++- l10n/es_AR/settings.po | 47 ++- l10n/es_MX/settings.po | 45 ++- l10n/et_EE/core.po | 20 +- l10n/et_EE/lib.po | 12 +- l10n/et_EE/settings.po | 61 ++- l10n/eu/settings.po | 47 ++- l10n/fa/settings.po | 47 ++- l10n/fi_FI/core.po | 12 +- l10n/fi_FI/lib.po | 20 +- l10n/fi_FI/settings.po | 61 ++- l10n/fr/settings.po | 62 ++- l10n/gl/core.po | 20 +- l10n/gl/lib.po | 12 +- l10n/gl/settings.po | 61 ++- l10n/he/settings.po | 47 ++- l10n/hi/core.po | 8 +- l10n/hi/files.po | 84 ++--- l10n/hi/files_sharing.po | 6 +- l10n/hi/settings.po | 49 ++- l10n/hr/settings.po | 45 ++- l10n/hu_HU/settings.po | 47 ++- l10n/hy/settings.po | 45 ++- l10n/ia/settings.po | 47 ++- l10n/id/settings.po | 45 ++- l10n/is/settings.po | 45 ++- l10n/it/core.po | 20 +- l10n/it/lib.po | 12 +- l10n/it/settings.po | 61 ++- l10n/ja_JP/core.po | 18 +- l10n/ja_JP/lib.po | 11 +- l10n/ja_JP/settings.po | 55 ++- l10n/ka/settings.po | 45 ++- l10n/ka_GE/settings.po | 45 ++- l10n/km/settings.po | 45 ++- l10n/kn/settings.po | 45 ++- l10n/ko/settings.po | 47 ++- l10n/ku_IQ/settings.po | 45 ++- l10n/lb/settings.po | 45 ++- l10n/lt_LT/core.po | 20 +- l10n/lt_LT/lib.po | 13 +- l10n/lt_LT/settings.po | 61 ++- l10n/lt_LT/user_ldap.po | 95 ++--- l10n/lv/settings.po | 45 ++- l10n/mk/settings.po | 47 ++- l10n/ml_IN/settings.po | 45 ++- l10n/ms_MY/settings.po | 47 ++- l10n/my_MM/settings.po | 45 ++- l10n/nb_NO/settings.po | 47 ++- l10n/ne/settings.po | 45 ++- l10n/nl/core.po | 32 +- l10n/nl/lib.po | 38 +- l10n/nl/settings.po | 61 ++- l10n/nn_NO/settings.po | 45 ++- l10n/nqo/settings.po | 45 ++- l10n/oc/settings.po | 45 ++- l10n/pa/core.po | 672 +++++++++++++++++++++++++++++++++ l10n/pa/files.po | 335 ++++++++++++++++ l10n/pa/files_encryption.po | 176 +++++++++ l10n/pa/files_external.po | 123 ++++++ l10n/pa/files_sharing.po | 80 ++++ l10n/pa/files_trashbin.po | 84 +++++ l10n/pa/files_versions.po | 43 +++ l10n/pa/lib.po | 334 ++++++++++++++++ l10n/pa/settings.po | 606 +++++++++++++++++++++++++++++ l10n/pa/user_ldap.po | 406 ++++++++++++++++++++ l10n/pa/user_webdavauth.po | 33 ++ l10n/pl/settings.po | 49 ++- l10n/pt_BR/core.po | 20 +- l10n/pt_BR/lib.po | 12 +- l10n/pt_BR/settings.po | 61 ++- l10n/pt_PT/settings.po | 47 ++- l10n/ro/settings.po | 45 ++- l10n/ru/settings.po | 47 ++- l10n/si_LK/settings.po | 45 ++- l10n/sk/settings.po | 45 ++- l10n/sk_SK/settings.po | 47 ++- l10n/sl/settings.po | 47 ++- l10n/sq/settings.po | 45 ++- l10n/sr/settings.po | 45 ++- l10n/sr@latin/settings.po | 45 ++- l10n/sv/settings.po | 47 ++- l10n/sw_KE/settings.po | 45 ++- l10n/ta_LK/settings.po | 45 ++- l10n/te/settings.po | 45 ++- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 16 +- l10n/templates/files_encryption.pot | 8 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 42 ++- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/settings.po | 47 ++- l10n/tr/settings.po | 47 ++- l10n/ug/settings.po | 45 ++- l10n/uk/files_encryption.po | 10 +- l10n/uk/settings.po | 45 ++- l10n/uk/user_webdavauth.po | 4 +- l10n/ur_PK/settings.po | 45 ++- l10n/vi/settings.po | 45 ++- l10n/zh_CN/settings.po | 47 ++- l10n/zh_HK/settings.po | 45 ++- l10n/zh_TW/settings.po | 47 ++- lib/l10n/ca.php | 3 + lib/l10n/cs_CZ.php | 3 + lib/l10n/de.php | 3 + lib/l10n/de_DE.php | 3 + lib/l10n/en_GB.php | 11 +- lib/l10n/et_EE.php | 3 + lib/l10n/fi_FI.php | 7 + lib/l10n/gl.php | 3 + lib/l10n/it.php | 3 + lib/l10n/ja_JP.php | 2 + lib/l10n/lt_LT.php | 3 + lib/l10n/nl.php | 16 + lib/l10n/pa.php | 16 + lib/l10n/pt_BR.php | 3 + settings/l10n/ca.php | 8 + settings/l10n/cs_CZ.php | 8 + settings/l10n/da.php | 8 + settings/l10n/de.php | 8 + settings/l10n/de_DE.php | 8 + settings/l10n/el.php | 1 + settings/l10n/en_GB.php | 8 + settings/l10n/eo.php | 1 + settings/l10n/es.php | 2 + settings/l10n/es_AR.php | 1 + settings/l10n/et_EE.php | 8 + settings/l10n/eu.php | 1 + settings/l10n/fa.php | 1 + settings/l10n/fi_FI.php | 8 + settings/l10n/fr.php | 8 + settings/l10n/gl.php | 8 + settings/l10n/he.php | 1 + settings/l10n/hi.php | 2 + settings/l10n/hu_HU.php | 1 + settings/l10n/ia.php | 1 + settings/l10n/it.php | 8 + settings/l10n/ja_JP.php | 5 + settings/l10n/ko.php | 1 + settings/l10n/lt_LT.php | 8 + settings/l10n/mk.php | 1 + settings/l10n/ms_MY.php | 1 + settings/l10n/nb_NO.php | 1 + settings/l10n/nl.php | 8 + settings/l10n/pa.php | 24 ++ settings/l10n/pl.php | 2 + settings/l10n/pt_BR.php | 8 + settings/l10n/pt_PT.php | 1 + settings/l10n/ru.php | 1 + settings/l10n/sk_SK.php | 1 + settings/l10n/sl.php | 1 + settings/l10n/sv.php | 1 + settings/l10n/th_TH.php | 1 + settings/l10n/tr.php | 1 + settings/l10n/zh_CN.php | 1 + settings/l10n/zh_TW.php | 1 + 265 files changed, 7904 insertions(+), 998 deletions(-) create mode 100644 apps/files/l10n/ach.php create mode 100644 apps/files/l10n/af_ZA.php create mode 100644 apps/files/l10n/be.php create mode 100644 apps/files/l10n/bs.php create mode 100644 apps/files/l10n/de_AT.php create mode 100644 apps/files/l10n/de_CH.php create mode 100644 apps/files/l10n/en_GB.php create mode 100644 apps/files/l10n/es_MX.php create mode 100644 apps/files/l10n/km.php create mode 100644 apps/files/l10n/kn.php create mode 100644 apps/files/l10n/ml_IN.php create mode 100644 apps/files/l10n/ne.php create mode 100644 apps/files/l10n/nqo.php create mode 100644 apps/files/l10n/pa.php create mode 100644 apps/files/l10n/sk.php create mode 100644 apps/files/l10n/sw_KE.php create mode 100644 apps/files_encryption/l10n/bs.php create mode 100644 apps/files_encryption/l10n/de_CH.php create mode 100644 apps/files_encryption/l10n/en_GB.php create mode 100644 apps/files_encryption/l10n/pa.php create mode 100644 apps/files_encryption/l10n/te.php create mode 100644 apps/files_external/l10n/de_CH.php create mode 100644 apps/files_external/l10n/en_GB.php create mode 100644 apps/files_external/l10n/pa.php create mode 100644 apps/files_sharing/l10n/de_CH.php create mode 100644 apps/files_sharing/l10n/en_GB.php create mode 100644 apps/files_sharing/l10n/pa.php create mode 100644 apps/files_trashbin/l10n/ach.php create mode 100644 apps/files_trashbin/l10n/af_ZA.php create mode 100644 apps/files_trashbin/l10n/be.php create mode 100644 apps/files_trashbin/l10n/bs.php create mode 100644 apps/files_trashbin/l10n/de_AT.php create mode 100644 apps/files_trashbin/l10n/de_CH.php create mode 100644 apps/files_trashbin/l10n/en@pirate.php create mode 100644 apps/files_trashbin/l10n/en_GB.php create mode 100644 apps/files_trashbin/l10n/es_MX.php create mode 100644 apps/files_trashbin/l10n/hi.php create mode 100644 apps/files_trashbin/l10n/ka.php create mode 100644 apps/files_trashbin/l10n/km.php create mode 100644 apps/files_trashbin/l10n/kn.php create mode 100644 apps/files_trashbin/l10n/ml_IN.php create mode 100644 apps/files_trashbin/l10n/my_MM.php create mode 100644 apps/files_trashbin/l10n/ne.php create mode 100644 apps/files_trashbin/l10n/nqo.php create mode 100644 apps/files_trashbin/l10n/pa.php create mode 100644 apps/files_trashbin/l10n/sk.php create mode 100644 apps/files_trashbin/l10n/sw_KE.php create mode 100644 apps/files_versions/l10n/cy_GB.php create mode 100644 apps/files_versions/l10n/de_CH.php create mode 100644 apps/files_versions/l10n/en_GB.php create mode 100644 apps/files_versions/l10n/sq.php create mode 100644 apps/user_ldap/l10n/de_CH.php create mode 100644 apps/user_ldap/l10n/en_GB.php create mode 100644 apps/user_ldap/l10n/pa.php create mode 100644 apps/user_webdavauth/l10n/de_CH.php create mode 100644 apps/user_webdavauth/l10n/en_GB.php create mode 100644 apps/user_webdavauth/l10n/fa.php create mode 100644 core/l10n/pa.php create mode 100644 l10n/pa/core.po create mode 100644 l10n/pa/files.po create mode 100644 l10n/pa/files_encryption.po create mode 100644 l10n/pa/files_external.po create mode 100644 l10n/pa/files_sharing.po create mode 100644 l10n/pa/files_trashbin.po create mode 100644 l10n/pa/files_versions.po create mode 100644 l10n/pa/lib.po create mode 100644 l10n/pa/settings.po create mode 100644 l10n/pa/user_ldap.po create mode 100644 l10n/pa/user_webdavauth.po create mode 100644 lib/l10n/pa.php create mode 100644 settings/l10n/pa.php (limited to 'lib') diff --git a/apps/files/l10n/ach.php b/apps/files/l10n/ach.php new file mode 100644 index 00000000000..3c711e6b78a --- /dev/null +++ b/apps/files/l10n/ach.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/af_ZA.php b/apps/files/l10n/af_ZA.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/af_ZA.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/be.php b/apps/files/l10n/be.php new file mode 100644 index 00000000000..17262d2184d --- /dev/null +++ b/apps/files/l10n/be.php @@ -0,0 +1,7 @@ + array("","","",""), +"_%n file_::_%n files_" => array("","","",""), +"_Uploading %n file_::_Uploading %n files_" => array("","","","") +); +$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/bs.php b/apps/files/l10n/bs.php new file mode 100644 index 00000000000..8ab07a97761 --- /dev/null +++ b/apps/files/l10n/bs.php @@ -0,0 +1,12 @@ + "Podijeli", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), +"_Uploading %n file_::_Uploading %n files_" => array("","",""), +"Name" => "Ime", +"Size" => "Veličina", +"Save" => "Spasi", +"Folder" => "Fasikla" +); +$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/de_AT.php b/apps/files/l10n/de_AT.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/de_AT.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php new file mode 100644 index 00000000000..2895135d17e --- /dev/null +++ b/apps/files/l10n/de_CH.php @@ -0,0 +1,77 @@ + "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.", +"Could not move %s" => "Konnte %s nicht verschieben", +"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.", +"Invalid Token" => "Ungültiges Merkmal", +"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler", +"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", +"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden", +"No file was uploaded" => "Keine Datei konnte übertragen werden.", +"Missing a temporary folder" => "Kein temporärer Ordner vorhanden", +"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", +"Not enough storage available" => "Nicht genug Speicher vorhanden.", +"Upload failed" => "Hochladen fehlgeschlagen", +"Invalid directory." => "Ungültiges Verzeichnis.", +"Files" => "Dateien", +"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist.", +"Not enough space available" => "Nicht genügend Speicherplatz verfügbar", +"Upload cancelled." => "Upload abgebrochen.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", +"URL cannot be empty." => "Die URL darf nicht leer sein.", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten.", +"Error" => "Fehler", +"Share" => "Teilen", +"Delete permanently" => "Endgültig löschen", +"Rename" => "Umbenennen", +"Pending" => "Ausstehend", +"{new_name} already exists" => "{new_name} existiert bereits", +"replace" => "ersetzen", +"suggest name" => "Namen vorschlagen", +"cancel" => "abbrechen", +"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", +"undo" => "rückgängig machen", +"_%n folder_::_%n folders_" => array("","%n Ordner"), +"_%n file_::_%n files_" => array("","%n Dateien"), +"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), +"files uploading" => "Dateien werden hoch geladen", +"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", +"File name cannot be empty." => "Der Dateiname darf nicht leer sein.", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.", +"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", +"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.", +"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern.", +"Name" => "Name", +"Size" => "Grösse", +"Modified" => "Geändert", +"%s could not be renamed" => "%s konnte nicht umbenannt werden", +"Upload" => "Hochladen", +"File handling" => "Dateibehandlung", +"Maximum upload size" => "Maximale Upload-Grösse", +"max. possible: " => "maximal möglich:", +"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:", +"Enable ZIP-download" => "ZIP-Download aktivieren", +"0 is unlimited" => "0 bedeutet unbegrenzt", +"Maximum input size for ZIP files" => "Maximale Grösse für ZIP-Dateien", +"Save" => "Speichern", +"New" => "Neu", +"Text file" => "Textdatei", +"Folder" => "Ordner", +"From link" => "Von einem Link", +"Deleted files" => "Gelöschte Dateien", +"Cancel upload" => "Upload abbrechen", +"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.", +"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!", +"Download" => "Herunterladen", +"Unshare" => "Freigabe aufheben", +"Delete" => "Löschen", +"Upload too large" => "Der Upload ist zu gross", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.", +"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", +"Current scanning" => "Scanne", +"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php new file mode 100644 index 00000000000..a13399a8db3 --- /dev/null +++ b/apps/files/l10n/en_GB.php @@ -0,0 +1,78 @@ + "Could not move %s - File with this name already exists", +"Could not move %s" => "Could not move %s", +"Unable to set upload directory." => "Unable to set upload directory.", +"Invalid Token" => "Invalid Token", +"No file was uploaded. Unknown error" => "No file was uploaded. Unknown error", +"There is no error, the file uploaded with success" => "There is no error, the file uploaded successfully", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form", +"The uploaded file was only partially uploaded" => "The uploaded file was only partially uploaded", +"No file was uploaded" => "No file was uploaded", +"Missing a temporary folder" => "Missing a temporary folder", +"Failed to write to disk" => "Failed to write to disk", +"Not enough storage available" => "Not enough storage available", +"Upload failed" => "Upload failed", +"Invalid directory." => "Invalid directory.", +"Files" => "Files", +"Unable to upload your file as it is a directory or has 0 bytes" => "Unable to upload your file as it is a directory or has 0 bytes", +"Not enough space available" => "Not enough space available", +"Upload cancelled." => "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.", +"URL cannot be empty." => "URL cannot be empty.", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud", +"Error" => "Error", +"Share" => "Share", +"Delete permanently" => "Delete permanently", +"Rename" => "Rename", +"Pending" => "Pending", +"{new_name} already exists" => "{new_name} already exists", +"replace" => "replace", +"suggest name" => "suggest name", +"cancel" => "cancel", +"replaced {new_name} with {old_name}" => "replaced {new_name} with {old_name}", +"undo" => "undo", +"_%n folder_::_%n folders_" => array("%n folder","%n folders"), +"_%n file_::_%n files_" => array("%n file","%n files"), +"{dirs} and {files}" => "{dirs} and {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"), +"files uploading" => "files uploading", +"'.' is an invalid file name." => "'.' is an invalid file name.", +"File name cannot be empty." => "File name cannot be empty.", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.", +"Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!", +"Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.", +"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.", +"Name" => "Name", +"Size" => "Size", +"Modified" => "Modified", +"%s could not be renamed" => "%s could not be renamed", +"Upload" => "Upload", +"File handling" => "File handling", +"Maximum upload size" => "Maximum upload size", +"max. possible: " => "max. possible: ", +"Needed for multi-file and folder downloads." => "Needed for multi-file and folder downloads.", +"Enable ZIP-download" => "Enable ZIP-download", +"0 is unlimited" => "0 is unlimited", +"Maximum input size for ZIP files" => "Maximum input size for ZIP files", +"Save" => "Save", +"New" => "New", +"Text file" => "Text file", +"Folder" => "Folder", +"From link" => "From link", +"Deleted files" => "Deleted files", +"Cancel upload" => "Cancel upload", +"You don’t have write permissions here." => "You don’t have write permission here.", +"Nothing in here. Upload something!" => "Nothing in here. Upload something!", +"Download" => "Download", +"Unshare" => "Unshare", +"Delete" => "Delete", +"Upload too large" => "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." => "Files are being scanned, please wait.", +"Current scanning" => "Current scanning", +"Upgrading filesystem cache..." => "Upgrading filesystem cache..." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/es_MX.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php index 7d2baab607d..549c928320d 100644 --- a/apps/files/l10n/hi.php +++ b/apps/files/l10n/hi.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), +"Upload" => "अपलोड ", "Save" => "सहेजें" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php new file mode 100644 index 00000000000..70ab6572ba4 --- /dev/null +++ b/apps/files/l10n/km.php @@ -0,0 +1,7 @@ + array(""), +"_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/kn.php b/apps/files/l10n/kn.php new file mode 100644 index 00000000000..70ab6572ba4 --- /dev/null +++ b/apps/files/l10n/kn.php @@ -0,0 +1,7 @@ + array(""), +"_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ml_IN.php b/apps/files/l10n/ml_IN.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/ml_IN.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ne.php b/apps/files/l10n/ne.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/ne.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/nqo.php b/apps/files/l10n/nqo.php new file mode 100644 index 00000000000..70ab6572ba4 --- /dev/null +++ b/apps/files/l10n/nqo.php @@ -0,0 +1,7 @@ + array(""), +"_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php new file mode 100644 index 00000000000..b28cb29622f --- /dev/null +++ b/apps/files/l10n/pa.php @@ -0,0 +1,17 @@ + "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ", +"Files" => "ਫਾਇਲਾਂ", +"Error" => "ਗਲਤੀ", +"Share" => "ਸਾਂਝਾ ਕਰੋ", +"Rename" => "ਨਾਂ ਬਦਲੋ", +"undo" => "ਵਾਪਸ", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), +"Upload" => "ਅੱਪਲੋਡ", +"Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ", +"Download" => "ਡਾਊਨਲੋਡ", +"Delete" => "ਹਟਾਓ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/sk.php b/apps/files/l10n/sk.php new file mode 100644 index 00000000000..a3178a95c47 --- /dev/null +++ b/apps/files/l10n/sk.php @@ -0,0 +1,7 @@ + array("","",""), +"_%n file_::_%n files_" => array("","",""), +"_Uploading %n file_::_Uploading %n files_" => array("","","") +); +$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files/l10n/sw_KE.php b/apps/files/l10n/sw_KE.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/sw_KE.php @@ -0,0 +1,7 @@ + array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/l10n/bs.php b/apps/files_encryption/l10n/bs.php new file mode 100644 index 00000000000..708e045adeb --- /dev/null +++ b/apps/files_encryption/l10n/bs.php @@ -0,0 +1,5 @@ + "Spašavam..." +); +$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php new file mode 100644 index 00000000000..aa867645c8d --- /dev/null +++ b/apps/files_encryption/l10n/de_CH.php @@ -0,0 +1,39 @@ + "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.", +"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", +"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.", +"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", +"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.", +"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", +"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.", +"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.", +"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von ausserhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.", +"Missing requirements." => "Fehlende Voraussetzungen", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.", +"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", +"Saving..." => "Speichern...", +"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von ausserhalb geändert.", +"You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem", +"personal settings" => "Persönliche Einstellungen", +"Encryption" => "Verschlüsselung", +"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", +"Recovery key password" => "Wiederherstellungschlüsselpasswort", +"Enabled" => "Aktiviert", +"Disabled" => "Deaktiviert", +"Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern", +"Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort", +"New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ", +"Change Password" => "Passwort ändern", +"Your private key password no longer match your log-in password:" => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.", +"Set your old private key password to your current log-in password." => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort.", +" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.", +"Old log-in password" => "Altes Login-Passwort", +"Current log-in password" => "Momentanes Login-Passwort", +"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren", +"Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.", +"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", +"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php new file mode 100644 index 00000000000..c220a4bdf04 --- /dev/null +++ b/apps/files_encryption/l10n/en_GB.php @@ -0,0 +1,39 @@ + "Recovery key enabled successfully", +"Could not enable recovery key. Please check your recovery key password!" => "Could not enable recovery key. Please check your recovery key password!", +"Recovery key successfully disabled" => "Recovery key disabled successfully", +"Could not disable recovery key. Please check your recovery key password!" => "Could not disable recovery key. Please check your recovery key password!", +"Password successfully changed." => "Password changed successfully.", +"Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.", +"Private key password successfully updated." => "Private key password updated successfully.", +"Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.", +"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.", +"Missing requirements." => "Missing requirements.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.", +"Following users are not set up for encryption:" => "Following users are not set up for encryption:", +"Saving..." => "Saving...", +"Your private key is not valid! Maybe the your password was changed from outside." => "Your private key is not valid! Maybe the your password was changed externally.", +"You can unlock your private key in your " => "You can unlock your private key in your ", +"personal settings" => "personal settings", +"Encryption" => "Encryption", +"Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):", +"Recovery key password" => "Recovery key password", +"Enabled" => "Enabled", +"Disabled" => "Disabled", +"Change recovery key password:" => "Change recovery key password:", +"Old Recovery key password" => "Old Recovery key password", +"New Recovery key password" => "New Recovery key password", +"Change Password" => "Change Password", +"Your private key password no longer match your log-in password:" => "Your private key password no longer match your login password:", +"Set your old private key password to your current log-in password." => "Set your old private key password to your current login password.", +" If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.", +"Old log-in password" => "Old login password", +"Current log-in password" => "Current login password", +"Update Private Key Password" => "Update Private Key Password", +"Enable password recovery:" => "Enable password recovery:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss", +"File recovery settings updated" => "File recovery settings updated", +"Could not update file recovery" => "Could not update file recovery" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/l10n/pa.php b/apps/files_encryption/l10n/pa.php new file mode 100644 index 00000000000..58670990409 --- /dev/null +++ b/apps/files_encryption/l10n/pa.php @@ -0,0 +1,5 @@ + "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/l10n/te.php b/apps/files_encryption/l10n/te.php new file mode 100644 index 00000000000..10c7a08a554 --- /dev/null +++ b/apps/files_encryption/l10n/te.php @@ -0,0 +1,5 @@ + "వ్యక్తిగత అమరికలు" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php new file mode 100644 index 00000000000..85e2f2d91fd --- /dev/null +++ b/apps/files_external/l10n/de_CH.php @@ -0,0 +1,28 @@ + "Zugriff gestattet", +"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox", +"Grant access" => "Zugriff gestatten", +"Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", +"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Warnung: «smbclient» ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.", +"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." => "Warnung:: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.", +"Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Achtung: Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.", +"External Storage" => "Externer Speicher", +"Folder name" => "Ordnername", +"External storage" => "Externer Speicher", +"Configuration" => "Konfiguration", +"Options" => "Optionen", +"Applicable" => "Zutreffend", +"Add storage" => "Speicher hinzufügen", +"None set" => "Nicht definiert", +"All Users" => "Alle Benutzer", +"Groups" => "Gruppen", +"Users" => "Benutzer", +"Delete" => "Löschen", +"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren", +"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden", +"SSL root certificates" => "SSL-Root-Zertifikate", +"Import Root Certificate" => "Root-Zertifikate importieren" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php new file mode 100644 index 00000000000..8adca794dda --- /dev/null +++ b/apps/files_external/l10n/en_GB.php @@ -0,0 +1,28 @@ + "Access granted", +"Error configuring Dropbox storage" => "Error configuring Dropbox storage", +"Grant access" => "Grant access", +"Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.", +"Error configuring Google Drive storage" => "Error configuring Google Drive storage", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.", +"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." => "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.", +"Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.", +"External Storage" => "External Storage", +"Folder name" => "Folder name", +"External storage" => "External storage", +"Configuration" => "Configuration", +"Options" => "Options", +"Applicable" => "Applicable", +"Add storage" => "Add storage", +"None set" => "None set", +"All Users" => "All Users", +"Groups" => "Groups", +"Users" => "Users", +"Delete" => "Delete", +"Enable User External Storage" => "Enable User External Storage", +"Allow users to mount their own external storage" => "Allow users to mount their own external storage", +"SSL root certificates" => "SSL root certificates", +"Import Root Certificate" => "Import Root Certificate" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/pa.php b/apps/files_external/l10n/pa.php new file mode 100644 index 00000000000..d633784f5ce --- /dev/null +++ b/apps/files_external/l10n/pa.php @@ -0,0 +1,6 @@ + "ਗਰੁੱਪ", +"Delete" => "ਹਟਾਓ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php new file mode 100644 index 00000000000..1bd24f9d9c4 --- /dev/null +++ b/apps/files_sharing/l10n/de_CH.php @@ -0,0 +1,19 @@ + "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", +"Password" => "Passwort", +"Submit" => "Bestätigen", +"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", +"Reasons might be:" => "Gründe könnten sein:", +"the item was removed" => "Das Element wurde entfernt", +"the link expired" => "Der Link ist abgelaufen", +"sharing is disabled" => "Teilen ist deaktiviert", +"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", +"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt", +"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt", +"Download" => "Herunterladen", +"Upload" => "Hochladen", +"Cancel upload" => "Upload abbrechen", +"No preview available for" => "Es ist keine Vorschau verfügbar für" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php new file mode 100644 index 00000000000..337c108651e --- /dev/null +++ b/apps/files_sharing/l10n/en_GB.php @@ -0,0 +1,19 @@ + "The password is wrong. Try again.", +"Password" => "Password", +"Submit" => "Submit", +"Sorry, this link doesn’t seem to work anymore." => "Sorry, this link doesn’t seem to work anymore.", +"Reasons might be:" => "Reasons might be:", +"the item was removed" => "the item was removed", +"the link expired" => "the link expired", +"sharing is disabled" => "sharing is disabled", +"For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.", +"%s shared the folder %s with you" => "%s shared the folder %s with you", +"%s shared the file %s with you" => "%s shared the file %s with you", +"Download" => "Download", +"Upload" => "Upload", +"Cancel upload" => "Cancel upload", +"No preview available for" => "No preview available for" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php index 74a2c320438..63a5d528f3b 100644 --- a/apps/files_sharing/l10n/hi.php +++ b/apps/files_sharing/l10n/hi.php @@ -1,5 +1,6 @@ "पासवर्ड" +"Password" => "पासवर्ड", +"Upload" => "अपलोड " ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/pa.php b/apps/files_sharing/l10n/pa.php new file mode 100644 index 00000000000..6c14eda59df --- /dev/null +++ b/apps/files_sharing/l10n/pa.php @@ -0,0 +1,8 @@ + "ਪਾਸਵਰ", +"Download" => "ਡਾਊਨਲੋਡ", +"Upload" => "ਅੱਪਲੋਡ", +"Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/ach.php b/apps/files_trashbin/l10n/ach.php new file mode 100644 index 00000000000..5569f410cc9 --- /dev/null +++ b/apps/files_trashbin/l10n/ach.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_trashbin/l10n/af_ZA.php b/apps/files_trashbin/l10n/af_ZA.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/af_ZA.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/be.php b/apps/files_trashbin/l10n/be.php new file mode 100644 index 00000000000..50df7ff5a97 --- /dev/null +++ b/apps/files_trashbin/l10n/be.php @@ -0,0 +1,6 @@ + array("","","",""), +"_%n file_::_%n files_" => array("","","","") +); +$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/bs.php b/apps/files_trashbin/l10n/bs.php new file mode 100644 index 00000000000..af7033bd183 --- /dev/null +++ b/apps/files_trashbin/l10n/bs.php @@ -0,0 +1,7 @@ + "Ime", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","","") +); +$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/de_AT.php b/apps/files_trashbin/l10n/de_AT.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/de_AT.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php new file mode 100644 index 00000000000..92290a0de50 --- /dev/null +++ b/apps/files_trashbin/l10n/de_CH.php @@ -0,0 +1,19 @@ + "Konnte %s nicht dauerhaft löschen", +"Couldn't restore %s" => "Konnte %s nicht wiederherstellen", +"perform restore operation" => "Wiederherstellung ausführen", +"Error" => "Fehler", +"delete file permanently" => "Datei dauerhaft löschen", +"Delete permanently" => "Endgültig löschen", +"Name" => "Name", +"Deleted" => "Gelöscht", +"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), +"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), +"restored" => "Wiederhergestellt", +"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!", +"Restore" => "Wiederherstellen", +"Delete" => "Löschen", +"Deleted Files" => "Gelöschte Dateien" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/en@pirate.php b/apps/files_trashbin/l10n/en@pirate.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/en@pirate.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php new file mode 100644 index 00000000000..bcfcfc86240 --- /dev/null +++ b/apps/files_trashbin/l10n/en_GB.php @@ -0,0 +1,19 @@ + "Couldn't delete %s permanently", +"Couldn't restore %s" => "Couldn't restore %s", +"perform restore operation" => "perform restore operation", +"Error" => "Error", +"delete file permanently" => "delete file permanently", +"Delete permanently" => "Delete permanently", +"Name" => "Name", +"Deleted" => "Deleted", +"_%n folder_::_%n folders_" => array("","%n folders"), +"_%n file_::_%n files_" => array("","%n files"), +"restored" => "restored", +"Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!", +"Restore" => "Restore", +"Delete" => "Delete", +"Deleted Files" => "Deleted Files" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/es_MX.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/hi.php b/apps/files_trashbin/l10n/hi.php new file mode 100644 index 00000000000..71711218b14 --- /dev/null +++ b/apps/files_trashbin/l10n/hi.php @@ -0,0 +1,7 @@ + "त्रुटि", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/ka.php b/apps/files_trashbin/l10n/ka.php new file mode 100644 index 00000000000..70f10d7c0bf --- /dev/null +++ b/apps/files_trashbin/l10n/ka.php @@ -0,0 +1,6 @@ + array(""), +"_%n file_::_%n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php new file mode 100644 index 00000000000..70f10d7c0bf --- /dev/null +++ b/apps/files_trashbin/l10n/km.php @@ -0,0 +1,6 @@ + array(""), +"_%n file_::_%n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/kn.php b/apps/files_trashbin/l10n/kn.php new file mode 100644 index 00000000000..70f10d7c0bf --- /dev/null +++ b/apps/files_trashbin/l10n/kn.php @@ -0,0 +1,6 @@ + array(""), +"_%n file_::_%n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/ml_IN.php b/apps/files_trashbin/l10n/ml_IN.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/ml_IN.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/my_MM.php b/apps/files_trashbin/l10n/my_MM.php new file mode 100644 index 00000000000..70f10d7c0bf --- /dev/null +++ b/apps/files_trashbin/l10n/my_MM.php @@ -0,0 +1,6 @@ + array(""), +"_%n file_::_%n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/ne.php b/apps/files_trashbin/l10n/ne.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/ne.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/nqo.php b/apps/files_trashbin/l10n/nqo.php new file mode 100644 index 00000000000..70f10d7c0bf --- /dev/null +++ b/apps/files_trashbin/l10n/nqo.php @@ -0,0 +1,6 @@ + array(""), +"_%n file_::_%n files_" => array("") +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/pa.php b/apps/files_trashbin/l10n/pa.php new file mode 100644 index 00000000000..e53707fd707 --- /dev/null +++ b/apps/files_trashbin/l10n/pa.php @@ -0,0 +1,8 @@ + "ਗਲਤੀ", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"Delete" => "ਹਟਾਓ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/sk.php b/apps/files_trashbin/l10n/sk.php new file mode 100644 index 00000000000..94aaf9b3a94 --- /dev/null +++ b/apps/files_trashbin/l10n/sk.php @@ -0,0 +1,6 @@ + array("","",""), +"_%n file_::_%n files_" => array("","","") +); +$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_trashbin/l10n/sw_KE.php b/apps/files_trashbin/l10n/sw_KE.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/sw_KE.php @@ -0,0 +1,6 @@ + array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_versions/l10n/cy_GB.php b/apps/files_versions/l10n/cy_GB.php new file mode 100644 index 00000000000..fa35dfd5218 --- /dev/null +++ b/apps/files_versions/l10n/cy_GB.php @@ -0,0 +1,5 @@ + "Adfer" +); +$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"; diff --git a/apps/files_versions/l10n/de_CH.php b/apps/files_versions/l10n/de_CH.php new file mode 100644 index 00000000000..c8b45eee500 --- /dev/null +++ b/apps/files_versions/l10n/de_CH.php @@ -0,0 +1,10 @@ + "Konnte %s nicht zurücksetzen", +"Versions" => "Versionen", +"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rückgänging machen.", +"More versions..." => "Mehrere Versionen...", +"No other versions available" => "Keine anderen Versionen verfügbar", +"Restore" => "Wiederherstellen" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_versions/l10n/en_GB.php b/apps/files_versions/l10n/en_GB.php new file mode 100644 index 00000000000..af22b8fb0b2 --- /dev/null +++ b/apps/files_versions/l10n/en_GB.php @@ -0,0 +1,10 @@ + "Could not revert: %s", +"Versions" => "Versions", +"Failed to revert {file} to revision {timestamp}." => "Failed to revert {file} to revision {timestamp}.", +"More versions..." => "More versions...", +"No other versions available" => "No other versions available", +"Restore" => "Restore" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_versions/l10n/sq.php b/apps/files_versions/l10n/sq.php new file mode 100644 index 00000000000..5a7a23a217f --- /dev/null +++ b/apps/files_versions/l10n/sq.php @@ -0,0 +1,5 @@ + "Rivendos" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php new file mode 100644 index 00000000000..df9175e73b1 --- /dev/null +++ b/apps/user_ldap/l10n/de_CH.php @@ -0,0 +1,87 @@ + "Löschen der Zuordnung fehlgeschlagen.", +"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen", +"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach", +"Deletion failed" => "Löschen fehlgeschlagen", +"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?", +"Keep settings?" => "Einstellungen beibehalten?", +"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl", +"mappings cleared" => "Zuordnungen gelöscht", +"Success" => "Erfolg", +"Error" => "Fehler", +"Connection test succeeded" => "Verbindungstest erfolgreich", +"Connection test failed" => "Verbindungstest fehlgeschlagen", +"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?", +"Confirm Deletion" => "Löschung bestätigen", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", +"Server configuration" => "Serverkonfiguration", +"Add Server Configuration" => "Serverkonfiguration hinzufügen", +"Host" => "Host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://", +"Base DN" => "Basis-DN", +"One Base DN per line" => "Ein Basis-DN pro Zeile", +"You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren", +"User DN" => "Benutzer-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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.", +"Password" => "Passwort", +"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.", +"User Login Filter" => "Benutzer-Login-Filter", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", +"User List Filter" => "Benutzer-Filter-Liste", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\"", +"Group Filter" => "Gruppen-Filter", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\"", +"Connection Settings" => "Verbindungseinstellungen", +"Configuration Active" => "Konfiguration aktiv", +"When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", +"Port" => "Port", +"Backup (Replica) Host" => "Backup Host (Kopie)", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.", +"Backup (Replica) Port" => "Backup Port", +"Disable Main Server" => "Hauptserver deaktivieren", +"Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", +"Use TLS" => "Nutze TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.", +"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)", +"Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", +"Cache Time-To-Live" => "Speichere Time-To-Live zwischen", +"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.", +"Directory Settings" => "Ordnereinstellungen", +"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", +"The LDAP attribute to use to generate the user's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.", +"Base User Tree" => "Basis-Benutzerbaum", +"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile", +"User Search Attributes" => "Benutzersucheigenschaften", +"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile", +"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe", +"The LDAP attribute to use to generate the groups's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.", +"Base Group Tree" => "Basis-Gruppenbaum", +"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile", +"Group Search Attributes" => "Gruppensucheigenschaften", +"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", +"Special Attributes" => "Spezielle Eigenschaften", +"Quota Field" => "Kontingent-Feld", +"Quota Default" => "Standard-Kontingent", +"in bytes" => "in Bytes", +"Email Field" => "E-Mail-Feld", +"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.", +"Internal Username" => "Interner Benutzername", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.", +"Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:", +"Override UUID detection" => "UUID-Erkennung überschreiben", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.", +"UUID Attribute:" => "UUID-Attribut:", +"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.", +"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung", +"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung", +"Test Configuration" => "Testkonfiguration", +"Help" => "Hilfe" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php new file mode 100644 index 00000000000..d613be34868 --- /dev/null +++ b/apps/user_ldap/l10n/en_GB.php @@ -0,0 +1,87 @@ + "Failed to clear the mappings.", +"Failed to delete the server configuration" => "Failed to delete the server configuration", +"The configuration is valid and the connection could be established!" => "The configuration is valid and the connection could be established!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "The configuration is valid, but the Bind failed. Please check the server settings and credentials.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "The configuration is invalid. Please look in the ownCloud log for further details.", +"Deletion failed" => "Deletion failed", +"Take over settings from recent server configuration?" => "Take over settings from recent server configuration?", +"Keep settings?" => "Keep settings?", +"Cannot add server configuration" => "Cannot add server configuration", +"mappings cleared" => "mappings cleared", +"Success" => "Success", +"Error" => "Error", +"Connection test succeeded" => "Connection test succeeded", +"Connection test failed" => "Connection test failed", +"Do you really want to delete the current Server Configuration?" => "Do you really want to delete the current Server Configuration?", +"Confirm Deletion" => "Confirm Deletion", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.", +"Server configuration" => "Server configuration", +"Add Server Configuration" => "Add Server Configuration", +"Host" => "Host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "You can omit the protocol, except you require SSL. Then start with ldaps://", +"Base DN" => "Base DN", +"One Base DN per line" => "One Base DN per line", +"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab", +"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." => "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.", +"Password" => "Password", +"For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.", +"User Login Filter" => "User Login Filter", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"", +"User List Filter" => "User List Filter", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"", +"Group Filter" => "Group Filter", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"", +"Connection Settings" => "Connection Settings", +"Configuration Active" => "Configuration Active", +"When unchecked, this configuration will be skipped." => "When unchecked, this configuration will be skipped.", +"Port" => "Port", +"Backup (Replica) Host" => "Backup (Replica) Host", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Give an optional backup host. It must be a replica of the main LDAP/AD server.", +"Backup (Replica) Port" => "Backup (Replica) Port", +"Disable Main Server" => "Disable Main Server", +"Only connect to the replica server." => "Only connect to the replica server.", +"Use TLS" => "Use TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.", +"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)", +"Turn off SSL certificate validation." => "Turn off SSL certificate validation.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.", +"Cache Time-To-Live" => "Cache Time-To-Live", +"in seconds. A change empties the cache." => "in seconds. A change empties the cache.", +"Directory Settings" => "Directory Settings", +"User Display Name Field" => "User Display Name Field", +"The LDAP attribute to use to generate the user's display name." => "The LDAP attribute to use to generate the user's display name.", +"Base User Tree" => "Base User Tree", +"One User Base DN per line" => "One User Base DN per line", +"User Search Attributes" => "User Search Attributes", +"Optional; one attribute per line" => "Optional; one attribute per line", +"Group Display Name Field" => "Group Display Name Field", +"The LDAP attribute to use to generate the groups's display name." => "The LDAP attribute to use to generate the group's display name.", +"Base Group Tree" => "Base Group Tree", +"One Group Base DN per line" => "One Group Base DN per line", +"Group Search Attributes" => "Group Search Attributes", +"Group-Member association" => "Group-Member association", +"Special Attributes" => "Special Attributes", +"Quota Field" => "Quota Field", +"Quota Default" => "Quota Default", +"in bytes" => "in bytes", +"Email Field" => "Email Field", +"User Home Folder Naming Rule" => "User Home Folder Naming Rule", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.", +"Internal Username" => "Internal Username", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.", +"Internal Username Attribute:" => "Internal Username Attribute:", +"Override UUID detection" => "Override UUID detection", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.", +"UUID Attribute:" => "UUID Attribute:", +"Username-LDAP User Mapping" => "Username-LDAP User Mapping", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.", +"Clear Username-LDAP User Mapping" => "Clear Username-LDAP User Mapping", +"Clear Groupname-LDAP Group Mapping" => "Clear Groupname-LDAP Group Mapping", +"Test Configuration" => "Test Configuration", +"Help" => "Help" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php index 2c3b938fcfe..f0522016825 100644 --- a/apps/user_ldap/l10n/lt_LT.php +++ b/apps/user_ldap/l10n/lt_LT.php @@ -1,13 +1,57 @@ "Nepavyko išvalyti sąsajų.", +"Failed to delete the server configuration" => "Nepavyko pašalinti serverio konfigūracijos", "Deletion failed" => "Ištrinti nepavyko", +"Keep settings?" => "Išlaikyti nustatymus?", +"mappings cleared" => "susiejimai išvalyti", +"Success" => "Sėkmingai", "Error" => "Klaida", +"Connection test succeeded" => "Ryšio patikrinimas pavyko", +"Connection test failed" => "Ryšio patikrinimas nepavyko", +"Do you really want to delete the current Server Configuration?" => "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?", +"Confirm Deletion" => "Patvirtinkite trynimą", +"Server configuration" => "Serverio konfigūravimas", +"Add Server Configuration" => "Pridėti serverio konfigūraciją", "Host" => "Mazgas", +"Base DN" => "Bazinis DN", +"One Base DN per line" => "Vienas bazinis DN eilutėje", +"User DN" => "Naudotojas DN", "Password" => "Slaptažodis", +"For anonymous access, leave DN and Password empty." => "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuščius.", +"User Login Filter" => "Naudotojo prisijungimo filtras", +"User List Filter" => "Naudotojo sąrašo filtras", "Group Filter" => "Grupės filtras", +"Connection Settings" => "Ryšio nustatymai", +"Configuration Active" => "Konfigūracija aktyvi", +"When unchecked, this configuration will be skipped." => "Kai nepažymėta, ši konfigūracija bus praleista.", "Port" => "Prievadas", +"Backup (Replica) Host" => "Atsarginės kopijos (Replica) mazgas", +"Backup (Replica) Port" => "Atsarginės kopijos (Replica) prievadas", +"Disable Main Server" => "Išjungti pagrindinį serverį", +"Only connect to the replica server." => "Tik prisijungti prie reprodukcinio (replica) serverio.", "Use TLS" => "Naudoti TLS", "Turn off SSL certificate validation." => "Išjungti SSL sertifikato tikrinimą.", +"Directory Settings" => "Katalogo nustatymai", +"Base User Tree" => "Bazinis naudotojo medis", +"User Search Attributes" => "Naudotojo paieškos atributai", +"Base Group Tree" => "Bazinis grupės medis", +"Group Search Attributes" => "Grupės paieškos atributai", +"Group-Member association" => "Grupės-Nario sąsaja", +"Special Attributes" => "Specialūs atributai", +"Quota Field" => "Kvotos laukas", +"Quota Default" => "Numatyta kvota", +"in bytes" => "baitais", +"Email Field" => "El. pašto laukas", +"User Home Folder Naming Rule" => "Naudotojo namų aplanko pavadinimo taisyklė", +"Internal Username" => "Vidinis naudotojo vardas", +"Internal Username Attribute:" => "Vidinis naudotojo vardo atributas:", +"Override UUID detection" => "Perrašyti UUID aptikimą", +"UUID Attribute:" => "UUID atributas:", +"Username-LDAP User Mapping" => "Naudotojo vardo - LDAP naudotojo sąsaja", +"Clear Username-LDAP User Mapping" => "Išvalyti naudotojo vardo - LDAP naudotojo sąsają", +"Clear Groupname-LDAP Group Mapping" => "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają", +"Test Configuration" => "Bandyti konfigūraciją", "Help" => "Pagalba" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/user_ldap/l10n/pa.php b/apps/user_ldap/l10n/pa.php new file mode 100644 index 00000000000..ac486a8ca2f --- /dev/null +++ b/apps/user_ldap/l10n/pa.php @@ -0,0 +1,6 @@ + "ਗਲਤੀ", +"Password" => "ਪਾਸਵਰ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/de_CH.php b/apps/user_webdavauth/l10n/de_CH.php new file mode 100644 index 00000000000..2c31957d251 --- /dev/null +++ b/apps/user_webdavauth/l10n/de_CH.php @@ -0,0 +1,7 @@ + "WebDAV-Authentifizierung", +"Address: " => "Adresse:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/en_GB.php b/apps/user_webdavauth/l10n/en_GB.php new file mode 100644 index 00000000000..c0982083377 --- /dev/null +++ b/apps/user_webdavauth/l10n/en_GB.php @@ -0,0 +1,7 @@ + "WebDAV Authentication", +"Address: " => "Address: ", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/fa.php b/apps/user_webdavauth/l10n/fa.php new file mode 100644 index 00000000000..ad061226d43 --- /dev/null +++ b/apps/user_webdavauth/l10n/fa.php @@ -0,0 +1,5 @@ + "اعتبار سنجی WebDAV " +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/ca.php b/core/l10n/ca.php index c86af43ada6..bc1960053a7 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Error en afegir %s als preferits.", "No categories selected for deletion." => "No hi ha categories per eliminar.", "Error removing %s from favorites." => "Error en eliminar %s dels preferits.", +"No image or file provided" => "No s'han proporcionat imatges o fitxers", +"Unknown filetype" => "Tipus de fitxer desconegut", +"Invalid image" => "Imatge no vàlida", +"No temporary profile picture available, try again" => "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho", +"No crop data provided" => "No heu proporcionat dades del retall", "Sunday" => "Diumenge", "Monday" => "Dilluns", "Tuesday" => "Dimarts", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "l'any passat", "years ago" => "anys enrere", "Choose" => "Escull", +"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}", "Yes" => "Sí", "No" => "No", "Ok" => "D'acord", +"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}", "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ó.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index be7af770015..aa5fd620c3e 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Chyba při přidávání %s k oblíbeným.", "No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.", "Error removing %s from favorites." => "Chyba při odebírání %s z oblíbených.", +"No image or file provided" => "Soubor nebo obrázek nebyl zadán", +"Unknown filetype" => "Neznámý typ souboru", +"Invalid image" => "Chybný obrázek", +"No temporary profile picture available, try again" => "Dočasný profilový obrázek není k dispozici, zkuste to znovu", +"No crop data provided" => "Nebyla poskytnuta data pro oříznutí obrázku", "Sunday" => "Neděle", "Monday" => "Pondělí", "Tuesday" => "Úterý", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "minulý rok", "years ago" => "před lety", "Choose" => "Vybrat", +"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}", "Yes" => "Ano", "No" => "Ne", "Ok" => "Ok", +"Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", diff --git a/core/l10n/de.php b/core/l10n/de.php index f248734d01c..934e227f91f 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.", "No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.", "Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.", +"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt", +"Unknown filetype" => "Unbekannter Dateityp", +"Invalid image" => "Ungültiges Bild", +"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal", +"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt", "Sunday" => "Sonntag", "Monday" => "Montag", "Tuesday" => "Dienstag", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", "Choose" => "Auswählen", +"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}", "Yes" => "Ja", "No" => "Nein", "Ok" => "OK", +"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 4616f50c2be..652ef737b68 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.", "No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.", "Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.", +"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt", +"Unknown filetype" => "Unbekannter Dateityp", +"Invalid image" => "Ungültiges Bild", +"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal", +"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt", "Sunday" => "Sonntag", "Monday" => "Montag", "Tuesday" => "Dienstag", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", "Choose" => "Auswählen", +"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}", "Yes" => "Ja", "No" => "Nein", "Ok" => "OK", +"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index 7ccdcbe5327..2d588ab2431 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Error adding %s to favourites.", "No categories selected for deletion." => "No categories selected for deletion.", "Error removing %s from favorites." => "Error removing %s from favourites.", +"No image or file provided" => "No image or file provided", +"Unknown filetype" => "Unknown filetype", +"Invalid image" => "Invalid image", +"No temporary profile picture available, try again" => "No temporary profile picture available, try again", +"No crop data provided" => "No crop data provided", "Sunday" => "Sunday", "Monday" => "Monday", "Tuesday" => "Tuesday", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "last year", "years ago" => "years ago", "Choose" => "Choose", +"Error loading file picker template: {error}" => "Error loading file picker template: {error}", "Yes" => "Yes", "No" => "No", "Ok" => "OK", +"Error loading message template: {error}" => "Error loading message template: {error}", "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 59c8e77a389..48fc5adcbb0 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.", "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.", "Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest.", +"No image or file provided" => "Ühtegi pilti või faili ei pakutud", +"Unknown filetype" => "Tundmatu failitüüp", +"Invalid image" => "Vigane pilt", +"No temporary profile picture available, try again" => "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti", +"No crop data provided" => "Lõikeandmeid ei leitud", "Sunday" => "Pühapäev", "Monday" => "Esmaspäev", "Tuesday" => "Teisipäev", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "viimasel aastal", "years ago" => "aastat tagasi", "Choose" => "Vali", +"Error loading file picker template: {error}" => "Viga faili valija malli laadimisel: {error}", "Yes" => "Jah", "No" => "Ei", "Ok" => "Ok", +"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}", "The object type is not specified." => "Objekti tüüp pole määratletud.", "Error" => "Viga", "The app name is not specified." => "Rakenduse nimi ole määratletud.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 25f5f466ef9..cb98a67b29d 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -14,6 +14,9 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.", "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.", "Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.", +"Unknown filetype" => "Tuntematon tiedostotyyppi", +"Invalid image" => "Virhellinen kuva", +"No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen", "Sunday" => "sunnuntai", "Monday" => "maanantai", "Tuesday" => "tiistai", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index ca07e510a30..ec137a4e04c 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.", "No categories selected for deletion." => "Non se seleccionaron categorías para eliminación.", "Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.", +"No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro", +"Unknown filetype" => "Tipo de ficheiro descoñecido", +"Invalid image" => "Imaxe incorrecta", +"No temporary profile picture available, try again" => "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo", +"No crop data provided" => "Non indicou como recortar", "Sunday" => "Domingo", "Monday" => "Luns", "Tuesday" => "Martes", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "último ano", "years ago" => "anos atrás", "Choose" => "Escoller", +"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}", "Yes" => "Si", "No" => "Non", "Ok" => "Aceptar", +"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}", "The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 29e67f68abf..e69f2ffcf53 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "Share with" => "के साथ साझा", "Password" => "पासवर्ड", "Send" => "भेजें", +"No people found" => "कोई व्यक्ति नहीं मिले ", "Sending ..." => "भेजा जा रहा है", "Email sent" => "ईमेल भेज दिया गया है ", "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", @@ -45,6 +46,7 @@ $TRANSLATIONS = array( "Help" => "सहयोग", "Cloud not found" => "क्लौड नहीं मिला ", "Add" => "डाले", +"Security Warning" => "सुरक्षा चेतावनी ", "Create an admin account" => "व्यवस्थापक खाता बनाएँ", "Advanced" => "उन्नत", "Data folder" => "डाटा फोल्डर", diff --git a/core/l10n/it.php b/core/l10n/it.php index a8f9a6901f8..72fb2756d29 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Errore durante l'aggiunta di %s ai preferiti.", "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.", "Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.", +"No image or file provided" => "Non è stata fornita alcun immagine o file", +"Unknown filetype" => "Tipo file sconosciuto", +"Invalid image" => "Immagine non valida", +"No temporary profile picture available, try again" => "Nessuna foto profilo temporanea disponibile, riprova", +"No crop data provided" => "Raccolta dati non prevista", "Sunday" => "Domenica", "Monday" => "Lunedì", "Tuesday" => "Martedì", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "anno scorso", "years ago" => "anni fa", "Choose" => "Scegli", +"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}", "Yes" => "Sì", "No" => "No", "Ok" => "Ok", +"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}", "The object type is not specified." => "Il tipo di oggetto non è specificato.", "Error" => "Errore", "The app name is not specified." => "Il nome dell'applicazione non è specificato.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 343fffd09b0..2416f23c8e9 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -16,6 +16,10 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "お気に入りに %s を追加エラー", "No categories selected for deletion." => "削除するカテゴリが選択されていません。", "Error removing %s from favorites." => "お気に入りから %s の削除エラー", +"No image or file provided" => "画像もしくはファイルが提供されていません", +"Unknown filetype" => "不明なファイルタイプ", +"Invalid image" => "無効な画像", +"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試して下さい", "Sunday" => "日", "Monday" => "月", "Tuesday" => "火", @@ -48,9 +52,11 @@ $TRANSLATIONS = array( "last year" => "一年前", "years ago" => "年前", "Choose" => "選択", +"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}", "Yes" => "はい", "No" => "いいえ", "Ok" => "OK", +"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", "The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", "The app name is not specified." => "アプリ名がしていされていません。", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 7b5ad39b81e..1fbcf891064 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Klaida perkeliant %s į jūsų mėgstamiausius.", "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.", "Error removing %s from favorites." => "Klaida ištrinant %s iš jūsų mėgstamiausius.", +"No image or file provided" => "Nenurodytas paveikslėlis ar failas", +"Unknown filetype" => "Nežinomas failo tipas", +"Invalid image" => "Netinkamas paveikslėlis", +"No temporary profile picture available, try again" => "Nėra laikino profilio paveikslėlio, bandykite dar kartą", +"No crop data provided" => "Nenurodyti apkirpimo duomenys", "Sunday" => "Sekmadienis", "Monday" => "Pirmadienis", "Tuesday" => "Antradienis", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "praeitais metais", "years ago" => "prieš metus", "Choose" => "Pasirinkite", +"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}", "Yes" => "Taip", "No" => "Ne", "Ok" => "Gerai", +"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}", "The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", "The app name is not specified." => "Nenurodytas programos pavadinimas.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index e181eee702a..be0b93f33cc 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s deelde »%s« met jou", "group" => "groep", +"Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld", +"Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld", +"Updated database" => "Database bijgewerkt", +"Updating filecache, this may take really long..." => "Bijwerken bestandscache. Dit kan even duren...", +"Updated filecache" => "Bestandscache bijgewerkt", +"... %d%% done ..." => "... %d%% gereed ...", "Category type not provided." => "Categorie type niet opgegeven.", "No category to add?" => "Geen categorie om toe te voegen?", "This category already exists: %s" => "Deze categorie bestaat al: %s", @@ -10,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.", "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.", "Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.", +"No image or file provided" => "Geen afbeelding of bestand opgegeven", +"Unknown filetype" => "Onbekend bestandsformaat", +"Invalid image" => "Ongeldige afbeelding", +"No temporary profile picture available, try again" => "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw", +"No crop data provided" => "Geen bijsnijdingsgegevens opgegeven", "Sunday" => "zondag", "Monday" => "maandag", "Tuesday" => "dinsdag", @@ -42,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "vorig jaar", "years ago" => "jaar geleden", "Choose" => "Kies", +"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}", "Yes" => "Ja", "No" => "Nee", "Ok" => "Ok", +"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}", "The object type is not specified." => "Het object type is niet gespecificeerd.", "Error" => "Fout", "The app name is not specified." => "De app naam is niet gespecificeerd.", diff --git a/core/l10n/pa.php b/core/l10n/pa.php new file mode 100644 index 00000000000..d51c26da8e1 --- /dev/null +++ b/core/l10n/pa.php @@ -0,0 +1,45 @@ + "ਐਤਵਾਰ", +"Monday" => "ਸੋਮਵਾਰ", +"Tuesday" => "ਮੰਗਲਵਾਰ", +"Wednesday" => "ਬੁੱਧਵਾਰ", +"Thursday" => "ਵੀਰਵਾਰ", +"Friday" => "ਸ਼ੁੱਕਰਵਾਰ", +"Saturday" => "ਸ਼ਨਿੱਚਰਵਾਰ", +"January" => "ਜਨਵਰੀ", +"February" => "ਫਰਵਰੀ", +"March" => "ਮਾਰਚ", +"April" => "ਅਪਰੈ", +"May" => "ਮਈ", +"June" => "ਜੂਨ", +"July" => "ਜੁਲਾਈ", +"August" => "ਅਗਸਤ", +"September" => "ਸਤੰਬ", +"October" => "ਅਕਤੂਬਰ", +"November" => "ਨਵੰਬ", +"December" => "ਦਸੰਬਰ", +"Settings" => "ਸੈਟਿੰਗ", +"seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ", +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"today" => "ਅੱਜ", +"yesterday" => "ਕੱਲ੍ਹ", +"_%n day ago_::_%n days ago_" => array("",""), +"last month" => "ਪਿਛਲੇ ਮਹੀਨੇ", +"_%n month ago_::_%n months ago_" => array("",""), +"months ago" => "ਮਹੀਨੇ ਪਹਿਲਾਂ", +"last year" => "ਪਿਛਲੇ ਸਾਲ", +"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ", +"Choose" => "ਚੁਣੋ", +"Yes" => "ਹਾਂ", +"No" => "ਨਹੀਂ", +"Ok" => "ਠੀਕ ਹੈ", +"Error" => "ਗਲ", +"Share" => "ਸਾਂਝਾ ਕਰੋ", +"Password" => "ਪਾਸਵਰ", +"Send" => "ਭੇਜੋ", +"Username" => "ਯੂਜ਼ਰ-ਨਾਂ", +"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index f758c0e9bc3..b25927ef237 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.", "No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.", "Error removing %s from favorites." => "Erro ao remover %s dos favoritos.", +"No image or file provided" => "Nenhuma imagem ou arquivo fornecido", +"Unknown filetype" => "Tipo de arquivo desconhecido", +"Invalid image" => "Imagem inválida", +"No temporary profile picture available, try again" => "Sem imagem no perfil temporário disponível, tente novamente", +"No crop data provided" => "Nenhum dado para coleta foi fornecido", "Sunday" => "Domingo", "Monday" => "Segunda-feira", "Tuesday" => "Terça-feira", @@ -48,9 +53,11 @@ $TRANSLATIONS = array( "last year" => "último ano", "years ago" => "anos atrás", "Choose" => "Escolha", +"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}", "Yes" => "Sim", "No" => "Não", "Ok" => "Ok", +"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}", "The object type is not specified." => "O tipo de objeto não foi especificado.", "Error" => "Erro", "The app name is not specified." => "O nome do app não foi especificado.", diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index 391035008ee..583ddc75694 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index a7e66145986..ee1052086e9 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index 89f4050805f..d047380c94d 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "فشل تحميل القائمة من الآب ستور" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "لم يتم التأكد من الشخصية بنجاح" @@ -84,6 +84,39 @@ msgstr "فشل إزالة المستخدم من المجموعة %s" msgid "Couldn't update app." msgstr "تعذر تحديث التطبيق." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "تم التحديث الى " @@ -128,15 +161,15 @@ msgstr "حدث" msgid "Updated" msgstr "تم التحديث بنجاح" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "جاري الحفظ..." diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 91422253471..211f77281ba 100644 --- a/l10n/be/settings.po +++ b/l10n/be/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index f83f6218c72..24ca5a353c2 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Възникна проблем с идентификацията" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Обновяване до {appversion}" @@ -128,15 +161,15 @@ msgstr "Обновяване" msgid "Updated" msgstr "Обновено" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Записване..." diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index dc3e3ab4aec..e40fc9e7161 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "অনুমোদন ঘটিত সমস্যা" @@ -84,6 +84,39 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "পরিবর্ধন" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "সংরক্ষণ করা হচ্ছে.." diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index b77acd17b7f..00340035350 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Spašavam..." diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 900c6cb8f00..6295fd0d36a 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:31+0000\n" +"Last-Translator: rogerc\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" @@ -94,23 +94,23 @@ msgstr "Error en eliminar %s dels preferits." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "No s'han proporcionat imatges o fitxers" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tipus de fitxer desconegut" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imatge no vàlida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "No heu proporcionat dades del retall" #: js/config.php:32 msgid "Sunday" @@ -250,7 +250,7 @@ msgstr "Escull" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -266,7 +266,7 @@ msgstr "D'acord" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Error en carregar la plantilla de missatge: {error}" #: 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 diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po index 641242729f7..c82e5efacb6 100644 --- a/l10n/ca/lib.po +++ b/l10n/ca/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:32+0000\n" +"Last-Translator: rogerc\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" @@ -56,15 +56,15 @@ msgstr "Ha fallat l'actualització \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Les imatges de perfil personals encara no funcionen amb encriptació" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tipus de fitxer desconegut" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imatge no vàlida" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 7f010b29f54..27282ac4a97 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "No s'ha pogut carregar la llista des de l'App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Error d'autenticació" @@ -86,6 +86,39 @@ msgstr "No es pot eliminar l'usuari del grup %s" msgid "Couldn't update app." msgstr "No s'ha pogut actualitzar l'aplicació." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualitza a {appversion}" @@ -130,15 +163,15 @@ msgstr "Actualitza" msgid "Updated" msgstr "Actualitzada" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Seleccioneu una imatge de perfil" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Desant..." @@ -462,31 +495,31 @@ msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Foto de perfil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Puja'n una de nova" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Selecciona'n una de nova dels fitxers" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Elimina imatge" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Cancel·la" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Selecciona com a imatge de perfil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index e16afa26bb1..9f985c26dfc 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 18:20+0000\n" +"Last-Translator: pstast \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" @@ -97,23 +97,23 @@ msgstr "Chyba při odebírání %s z oblíbených." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Soubor nebo obrázek nebyl zadán" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Neznámý typ souboru" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Chybný obrázek" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Dočasný profilový obrázek není k dispozici, zkuste to znovu" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Nebyla poskytnuta data pro oříznutí obrázku" #: js/config.php:32 msgid "Sunday" @@ -257,7 +257,7 @@ msgstr "Vybrat" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Chyba při nahrávání šablony výběru souborů: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -273,7 +273,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Chyba při nahrávání šablony zprávy: {error}" #: 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 diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 183bc420e80..ef75336427f 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 18:20+0000\n" +"Last-Translator: pstast \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" @@ -58,15 +58,15 @@ msgstr "Selhala aktualizace verze \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Vlastní profilové obrázky zatím nefungují v kombinaci se šifrováním" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Neznámý typ souboru" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Chybný obrázek" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 3d030548d8b..971650d2c96 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "Nelze načíst seznam z App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Chyba přihlášení" @@ -88,6 +88,39 @@ msgstr "Nelze odebrat uživatele ze skupiny %s" msgid "Couldn't update app." msgstr "Nelze aktualizovat aplikaci." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizovat na {appversion}" @@ -132,15 +165,15 @@ msgstr "Aktualizovat" msgid "Updated" msgstr "Aktualizováno" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Vyberte profilový obrázek" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Ukládám..." @@ -464,31 +497,31 @@ msgstr "Pro povolení obnovy hesla vyplňte e-mailovou adresu" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilová fotka" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Nahrát nový" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Vyberte nový ze souborů" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Odebrat obrázek" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Přerušit" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Vybrat jako profilový obrázek" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 98cd0448cb0..93b67e8505f 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Gwall dilysu" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Yn cadw..." diff --git a/l10n/da/settings.po b/l10n/da/settings.po index faa811aa785..44feb2e8445 100644 --- a/l10n/da/settings.po +++ b/l10n/da/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -25,7 +25,7 @@ msgid "Unable to load list from App Store" msgstr "Kunne ikke indlæse listen fra App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Adgangsfejl" @@ -87,6 +87,39 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s" msgid "Couldn't update app." msgstr "Kunne ikke opdatere app'en." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Opdatér til {appversion}" @@ -131,15 +164,15 @@ msgstr "Opdater" msgid "Updated" msgstr "Opdateret" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Vælg et profilbillede" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. " -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Gemmer..." @@ -463,31 +496,31 @@ msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbillede" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Upload nyt" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Vælg nyt fra Filer" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Fjern billede" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. " #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Afbryd" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Vælg som profilbillede" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/de/core.po b/l10n/de/core.po index fa8b284b671..46627cf2e0f 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,23 +100,23 @@ msgstr "Fehler beim Entfernen von %s von den Favoriten." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Kein Bild oder Datei zur Verfügung gestellt" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Unbekannter Dateityp" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Ungültiges Bild" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Keine Zuschnittdaten zur Verfügung gestellt" #: js/config.php:32 msgid "Sunday" @@ -256,7 +256,7 @@ msgstr "Auswählen" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -272,7 +272,7 @@ msgstr "OK" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" #: 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 diff --git a/l10n/de/lib.po b/l10n/de/lib.po index 2a01484425c..c054df799c0 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,15 +59,15 @@ msgstr "Konnte \"%s\" nicht aktualisieren." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Unbekannter Dateityp" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Ungültiges Bild" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 1a8503a3791..312f288f6dc 100644 --- a/l10n/de/settings.po +++ b/l10n/de/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgid "Unable to load list from App Store" msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Fehler bei der Anmeldung" @@ -89,6 +89,39 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualisiere zu {appversion}" @@ -133,15 +166,15 @@ msgstr "Aktualisierung durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Wähle ein Profilbild" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Speichern..." @@ -465,31 +498,31 @@ msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu akti #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbild" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Neues hochladen" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Neues aus den Dateien wählen" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Bild entfernen" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abbrechen" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Als Profilbild wählen" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index d75c8166a6e..d78892f1640 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index 0e4f92b5e6a..d1623c88a23 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgid "Unable to load list from App Store" msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Authentifizierungs-Fehler" @@ -92,6 +92,39 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Update zu {appversion}" @@ -136,15 +169,15 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Speichern..." diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index f1d1a4a9c64..522345b9263 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,23 +100,23 @@ msgstr "Fehler beim Entfernen von %s von den Favoriten." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Kein Bild oder Datei zur Verfügung gestellt" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Unbekannter Dateityp" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Ungültiges Bild" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Keine Zuschnittdaten zur Verfügung gestellt" #: js/config.php:32 msgid "Sunday" @@ -256,7 +256,7 @@ msgstr "Auswählen" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -272,7 +272,7 @@ msgstr "OK" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" #: 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 diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 76d7fef1489..e70bc08de29 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,15 +58,15 @@ msgstr "Konnte \"%s\" nicht aktualisieren." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Unbekannter Dateityp" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Ungültiges Bild" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index bd55435a00e..bbcb8220fa1 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "Unable to load list from App Store" msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Authentifizierungs-Fehler" @@ -91,6 +91,39 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Update zu {appversion}" @@ -135,15 +168,15 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Wählen Sie ein Profilbild" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Speichern..." @@ -467,31 +500,31 @@ msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstell #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbild" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Neues hochladen" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Neues aus den Dateien wählen" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Bild entfernen" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abbrechen" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Als Profilbild wählen" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 20c03f9adc2..7b975e813ed 100644 --- a/l10n/el/settings.po +++ b/l10n/el/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -28,7 +28,7 @@ msgid "Unable to load list from App Store" msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Σφάλμα πιστοποίησης" @@ -90,6 +90,39 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ msgid "Couldn't update app." msgstr "Αδυναμία ενημέρωσης εφαρμογής" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Ενημέρωση σε {appversion}" @@ -134,15 +167,15 @@ msgstr "Ενημέρωση" msgid "Updated" msgstr "Ενημερώθηκε" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Γίνεται αποθήκευση..." @@ -466,7 +499,7 @@ msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικο #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Φωτογραφία προφίλ" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index b03ef2fbfbc..34070d5228f 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index c58c6317903..e6d3d657379 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 13:30+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,23 +93,23 @@ msgstr "Error removing %s from favourites." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "No image or file provided" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Unknown filetype" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Invalid image" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "No temporary profile picture available, try again" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "No crop data provided" #: js/config.php:32 msgid "Sunday" @@ -249,7 +249,7 @@ msgstr "Choose" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Error loading file picker template: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -265,7 +265,7 @@ msgstr "OK" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Error loading message template: {error}" #: 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 diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po index 6f634603672..14e6d1c7a8b 100644 --- a/l10n/en_GB/lib.po +++ b/l10n/en_GB/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 13:32+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,15 +56,15 @@ msgstr "Failed to upgrade \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Custom profile pictures don't work with encryption yet" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Unknown filetype" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Invalid image" #: defaults.php:35 msgid "web services under your control" @@ -284,13 +284,13 @@ msgstr "seconds ago" #: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" +msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" #: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" +msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" #: template/functions.php:99 @@ -304,7 +304,7 @@ msgstr "yesterday" #: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" +msgstr[0] "%n day go" msgstr[1] "%n days ago" #: template/functions.php:102 @@ -314,7 +314,7 @@ msgstr "last month" #: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" +msgstr[0] "%n month ago" msgstr[1] "%n months ago" #: template/functions.php:104 diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index 7187857ac83..27be15c7521 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Unable to load list from App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Authentication error" @@ -85,6 +85,39 @@ msgstr "Unable to remove user from group %s" msgid "Couldn't update app." msgstr "Couldn't update app." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Update to {appversion}" @@ -129,15 +162,15 @@ msgstr "Update" msgid "Updated" msgstr "Updated" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Select a profile picture" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decrypting files... Please wait, this can take some time." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Saving..." @@ -461,31 +494,31 @@ msgstr "Fill in an email address to enable password recovery" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profile picture" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Upload new" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Select new from Files" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Remove image" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Either png or jpg. Ideally square but you will be able to crop it." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abort" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Choose as profile image" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 405b43ad00d..f773f8e97ae 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Ne eblis ŝargi liston el aplikaĵovendejo" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Aŭtentiga eraro" @@ -84,6 +84,39 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "Ĝisdatigi" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Konservante..." @@ -460,7 +493,7 @@ msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profila bildo" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 32d2de1aad9..e93338b73e9 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -30,7 +30,7 @@ msgid "Unable to load list from App Store" msgstr "Imposible cargar la lista desde el App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Error de autenticación" @@ -92,6 +92,39 @@ msgstr "No se pudo eliminar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la aplicacion." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizado a {appversion}" @@ -136,15 +169,15 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Guardando..." @@ -468,7 +501,7 @@ msgstr "Escriba una dirección de correo electrónico para restablecer la contra #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Foto del perfil" #: templates/personal.php:90 msgid "Upload new" @@ -488,7 +521,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index e91cf0d7808..512b5a949f4 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -25,7 +25,7 @@ msgid "Unable to load list from App Store" msgstr "Imposible cargar la lista desde el App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Error al autenticar" @@ -87,6 +87,39 @@ msgstr "No es posible borrar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la App." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar a {appversion}" @@ -131,15 +164,15 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptando archivos... Por favor espere, esto puede tardar." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Guardando..." @@ -483,7 +516,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index e4d80e5f683..c0dcfcc0d5b 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 7e163f5efcd..eb1f23ddad0 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 08:20+0000\n" +"Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,23 +94,23 @@ msgstr "Viga %s eemaldamisel lemmikutest." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Ühtegi pilti või faili ei pakutud" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tundmatu failitüüp" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Vigane pilt" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Lõikeandmeid ei leitud" #: js/config.php:32 msgid "Sunday" @@ -250,7 +250,7 @@ msgstr "Vali" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Viga faili valija malli laadimisel: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -266,7 +266,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Viga sõnumi malli laadimisel: {error}" #: 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 diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index 4883978e98a..70416438c16 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 08:20+0000\n" +"Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,15 +57,15 @@ msgstr "Ebaõnnestunud uuendus \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tundmatu failitüüp" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Vigane pilt" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 99a5ced11e1..fce1cc2fbc0 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "App Store'i nimekirja laadimine ebaõnnestus" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentimise viga" @@ -86,6 +86,39 @@ msgstr "Kasutajat ei saa eemaldada grupist %s" msgid "Couldn't update app." msgstr "Rakenduse uuendamine ebaõnnestus." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Uuenda versioonile {appversion}" @@ -130,15 +163,15 @@ msgstr "Uuenda" msgid "Updated" msgstr "Uuendatud" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Vali profiili pilt" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Salvestamine..." @@ -462,31 +495,31 @@ msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profiili pilt" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Laadi uus" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Vali failidest uus" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Eemalda pilt" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Katkesta" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Vali kui profiili pilt" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 2255ef9ef78..fd516826967 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Ezin izan da App Dendatik zerrenda kargatu" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentifikazio errorea" @@ -86,6 +86,39 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu" msgid "Couldn't update app." msgstr "Ezin izan da aplikazioa eguneratu." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Eguneratu {appversion}-ra" @@ -130,15 +163,15 @@ msgstr "Eguneratu" msgid "Updated" msgstr "Eguneratuta" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Gordetzen..." @@ -462,7 +495,7 @@ msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilaren irudia" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 2682e4f1236..587c70ba4a9 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "خطا در اعتبار سنجی" @@ -85,6 +85,39 @@ msgstr "امکان حذف کاربر از گروه %s نیست" msgid "Couldn't update app." msgstr "برنامه را نمی توان به هنگام ساخت." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "بهنگام شده به {appversion}" @@ -129,15 +162,15 @@ msgstr "به روز رسانی" msgid "Updated" msgstr "بروز رسانی انجام شد" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "در حال ذخیره سازی..." @@ -461,7 +494,7 @@ msgstr "پست الکترونیکی را پرکنید تا بازیابی گذ #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "تصویر پروفایل" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 7935371a417..499d8b2d8d6 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -98,15 +98,15 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tuntematon tiedostotyyppi" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Virhellinen kuva" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen" #: avatar/controller.php:135 msgid "No crop data provided" diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po index f6134419be0..41e7241ad3d 100644 --- a/l10n/fi_FI/lib.po +++ b/l10n/fi_FI/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -27,7 +27,7 @@ msgstr "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytöss #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Sovelluksen nimeä ei määritelty" #: app.php:361 msgid "Help" @@ -52,19 +52,19 @@ msgstr "Ylläpitäjä" #: app.php:839 #, php-format msgid "Failed to upgrade \"%s\"." -msgstr "" +msgstr "Kohteen \"%s\" päivitys epäonnistui." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tuntematon tiedostotyyppi" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Virheellinen kuva" #: defaults.php:35 msgid "web services under your control" @@ -124,13 +124,13 @@ msgstr "Sovellus ei sisällä info.xml-tiedostoa" #: installer.php:131 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia" #: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa" #: installer.php:146 msgid "" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index b9581c966b4..60eda83c46b 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Tunnistautumisvirhe" @@ -85,6 +85,39 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu" msgid "Couldn't update app." msgstr "Sovelluksen päivitys epäonnistui." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Päivitä versioon {appversion}" @@ -129,15 +162,15 @@ msgstr "Päivitä" msgid "Updated" msgstr "Päivitetty" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Valitse profiilikuva" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Tallennetaan..." @@ -461,31 +494,31 @@ msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista pal #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profiilikuva" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Lähetä uusi" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Valitse uusi tiedostoista" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Poista kuva" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Keskeytä" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Valitse profiilikuvaksi" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index aab0b21d497..49cfd880244 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -6,13 +6,14 @@ # Adalberto Rodrigues , 2013 # Christophe Lherieau , 2013 # lyly95, 2013 +# Mystyle , 2013 # red0ne , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +27,7 @@ msgid "Unable to load list from App Store" msgstr "Impossible de charger la liste depuis l'App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Erreur d'authentification" @@ -88,6 +89,39 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s" msgid "Couldn't update app." msgstr "Impossible de mettre à jour l'application" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Mettre à jour vers {appversion}" @@ -132,15 +166,15 @@ msgstr "Mettre à jour" msgid "Updated" msgstr "Mise à jour effectuée avec succès" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Selectionner une photo de profil " -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Enregistrement..." @@ -464,31 +498,31 @@ msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot d #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Photo de profil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Télécharger nouveau" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Sélectionner un nouveau depuis les documents" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Supprimer l'image" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer ." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abandonner" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Choisir en temps que photo de profil " #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index ac5a3fc0f0a..a4c485ede18 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,23 +93,23 @@ msgstr "Produciuse un erro ao eliminar %s dos favoritos." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Non forneceu ningunha imaxe ou ficheiro" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo de ficheiro descoñecido" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imaxe incorrecta" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Non indicou como recortar" #: js/config.php:32 msgid "Sunday" @@ -249,7 +249,7 @@ msgstr "Escoller" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Produciuse un erro ao cargar o modelo do selector: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -265,7 +265,7 @@ msgstr "Aceptar" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}" #: 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 diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index 430902b2c23..9cb8c43c361 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,15 +56,15 @@ msgstr "Non foi posíbel anovar «%s»." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "As imaxes personalizadas de perfil aínda non funcionan co cifrado" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo de ficheiro descoñecido" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imaxe incorrecta" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 58154e88f49..df5d5ec7294 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Non foi posíbel cargar a lista desde a App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Produciuse un erro de autenticación" @@ -85,6 +85,39 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s" msgid "Couldn't update app." msgstr "Non foi posíbel actualizar o aplicativo." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar á {appversion}" @@ -129,15 +162,15 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Seleccione unha imaxe para o perfil" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheiros... isto pode levar un anaco." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Gardando..." @@ -461,31 +494,31 @@ msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperació #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Imaxe do perfil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Novo envío" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Seleccione unha nova de ficheiros" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Retirar a imaxe" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Cancelar" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Escolla unha imaxe para o perfil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 7115b110ec1..275d36704f8 100644 --- a/l10n/he/settings.po +++ b/l10n/he/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "לא ניתן לטעון רשימה מה־App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "שגיאת הזדהות" @@ -85,6 +85,39 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s" msgid "Couldn't update app." msgstr "לא ניתן לעדכן את היישום." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "עדכון לגרסה {appversion}" @@ -129,15 +162,15 @@ msgstr "עדכון" msgid "Updated" msgstr "מעודכן" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "שמירה…" @@ -461,7 +494,7 @@ msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שח #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "תמונת פרופיל" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index c90f0a41137..31d7caf5d3e 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 15:30+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" @@ -359,7 +359,7 @@ msgstr "" #: js/share.js:245 msgid "No people found" -msgstr "" +msgstr "कोई व्यक्ति नहीं मिले " #: js/share.js:283 msgid "Resharing is not allowed" @@ -539,7 +539,7 @@ msgstr "डाले" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 msgid "Security Warning" -msgstr "" +msgstr "सुरक्षा चेतावनी " #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 67aa5d887df..1be595e8e63 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -86,32 +86,32 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 +#: js/file-upload.js:40 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:53 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:91 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:206 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:280 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:285 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 msgid "Error" msgstr "त्रुटि" @@ -127,57 +127,57 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:417 js/filelist.js:419 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:417 js/filelist.js:419 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:417 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:417 js/filelist.js:419 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:464 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:464 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:542 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:698 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 +#: js/filelist.js:763 msgid "files uploading" msgstr "" @@ -209,21 +209,21 @@ msgid "" "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:322 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:579 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:580 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:581 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,9 +232,9 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" -msgstr "" +msgstr "अपलोड " #: templates/admin.php:5 msgid "File handling" @@ -268,65 +268,65 @@ msgstr "" msgid "Save" msgstr "सहेजें" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po index c9f6dc720fd..546e758e1c7 100644 --- a/l10n/hi/files_sharing.po +++ b/l10n/hi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "" #: templates/public.php:43 templates/public.php:46 msgid "Upload" -msgstr "" +msgstr "अपलोड " #: templates/public.php:56 msgid "Cancel upload" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index 4e7d9242b24..f54504cd727 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "अद्यतन" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" @@ -187,7 +220,7 @@ msgstr "" #: templates/admin.php:15 msgid "Security Warning" -msgstr "" +msgstr "सुरक्षा चेतावनी " #: templates/admin.php:18 msgid "" @@ -480,7 +513,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "रद्द करना " #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index 13772a82905..db3bfe8145c 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Nemogićnost učitavanja liste sa Apps Stora" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Greška kod autorizacije" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Spremanje..." diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 93228ebc6c7..7643899f6d9 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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,7 +25,7 @@ msgid "Unable to load list from App Store" msgstr "Nem tölthető le a lista az App Store-ból" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Azonosítási hiba" @@ -87,6 +87,39 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s" msgid "Couldn't update app." msgstr "A program frissítése nem sikerült." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Frissítés erre a verzióra: {appversion}" @@ -131,15 +164,15 @@ msgstr "Frissítés" msgid "Updated" msgstr "Frissítve" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Mentés..." @@ -463,7 +496,7 @@ msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha el #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilkép" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index 35712856251..faf9956c067 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index dfe9a6ffe84..b88c80f02cb 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "Actualisar" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" @@ -460,7 +493,7 @@ msgstr "" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Imagine de profilo" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 5f0fefa325d..260df1998ac 100644 --- a/l10n/id/settings.po +++ b/l10n/id/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Tidak dapat memuat daftar dari App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Galat saat autentikasi" @@ -84,6 +84,39 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s" msgid "Couldn't update app." msgstr "Tidak dapat memperbarui aplikasi." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Perbarui ke {appversion}" @@ -128,15 +161,15 @@ msgstr "Perbarui" msgid "Updated" msgstr "Diperbarui" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Menyimpan..." diff --git a/l10n/is/settings.po b/l10n/is/settings.po index f444914ef0d..033cdb62333 100644 --- a/l10n/is/settings.po +++ b/l10n/is/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Ekki tókst að hlaða lista frá forrita síðu" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Villa við auðkenningu" @@ -85,6 +85,39 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -129,15 +162,15 @@ msgstr "Uppfæra" msgid "Updated" msgstr "Uppfært" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Er að vista ..." diff --git a/l10n/it/core.po b/l10n/it/core.po index 10f3e72f5d7..ab95d67cc34 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 22:30+0000\n" +"Last-Translator: polxmod \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" @@ -95,23 +95,23 @@ msgstr "Errore durante la rimozione di %s dai preferiti." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Non è stata fornita alcun immagine o file" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo file sconosciuto" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Immagine non valida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Nessuna foto profilo temporanea disponibile, riprova" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Raccolta dati non prevista" #: js/config.php:32 msgid "Sunday" @@ -251,7 +251,7 @@ msgstr "Scegli" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Errore durante il caricamento del modello del selettore file: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -267,7 +267,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Errore durante il caricamento del modello di messaggio: {error}" #: 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 diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 2fa3217657f..8c5f8ced5fc 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 22:30+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" @@ -58,15 +58,15 @@ msgstr "Aggiornamento non riuscito \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura." #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo file sconosciuto" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Immagine non valida" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index cb888134db5..6988cc5e5f1 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "Impossibile caricare l'elenco dall'App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Errore di autenticazione" @@ -88,6 +88,39 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s" msgid "Couldn't update app." msgstr "Impossibile aggiornate l'applicazione." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aggiorna a {appversion}" @@ -132,15 +165,15 @@ msgstr "Aggiorna" msgid "Updated" msgstr "Aggiornato" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Seleziona un'immagine del profilo" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Salvataggio in corso..." @@ -464,31 +497,31 @@ msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della passwor #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Immagine del profilo" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Carica nuova" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Seleziona nuova da file" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Rimuovi immagine" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Interrompi" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Scegli come immagine del profilo" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index b9f05311701..d6343899dc2 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 05:50+0000\n" +"Last-Translator: Daisuke Deguchi \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" @@ -96,19 +96,19 @@ msgstr "お気に入りから %s の削除エラー" #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "画像もしくはファイルが提供されていません" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "不明なファイルタイプ" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "無効な画像" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "一時的なプロファイル用画像が利用できません。もう一度試して下さい" #: avatar/controller.php:135 msgid "No crop data provided" @@ -248,7 +248,7 @@ msgstr "選択" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "ファイル選択テンプレートの読み込みエラー: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -264,7 +264,7 @@ msgstr "OK" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "メッセージテンプレートの読み込みエラー: {error}" #: 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 diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index c910ea90993..7cae81c6ad9 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Daisuke Deguchi , 2013 # plazmism , 2013 # Koichi MATSUMOTO , 2013 # tt yn , 2013 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 05:50+0000\n" +"Last-Translator: Daisuke Deguchi \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" @@ -62,11 +63,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "不明なファイルタイプ" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "無効な画像" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index b0dd14f5584..cc0e31052f0 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -25,7 +25,7 @@ msgid "Unable to load list from App Store" msgstr "アプリストアからリストをロードできません" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "認証エラー" @@ -87,6 +87,39 @@ msgstr "ユーザをグループ %s から削除できません" msgid "Couldn't update app." msgstr "アプリを更新出来ませんでした。" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} に更新" @@ -131,15 +164,15 @@ msgstr "更新" msgid "Updated" msgstr "更新済み" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "プロファイル画像を選択" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "保存中..." @@ -463,7 +496,7 @@ msgstr "※パスワード回復を有効にするにはメールアドレスの #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "プロフィール写真" #: templates/personal.php:90 msgid "Upload new" @@ -475,7 +508,7 @@ msgstr "" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "画像を削除" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -483,11 +516,11 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "中止" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "プロファイル画像として選択" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po index 8e2b2cb50db..139784572dd 100644 --- a/l10n/ka/settings.po +++ b/l10n/ka/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index b2b70884df1..1b89539f148 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "ავთენტიფიკაციის შეცდომა" @@ -85,6 +85,39 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ msgid "Couldn't update app." msgstr "ვერ მოხერხდა აპლიკაციის განახლება." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "განაახლე {appversion}–მდე" @@ -129,15 +162,15 @@ msgstr "განახლება" msgid "Updated" msgstr "განახლებულია" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "შენახვა..." diff --git a/l10n/km/settings.po b/l10n/km/settings.po index e32f2e8796c..bf3b7985905 100644 --- a/l10n/km/settings.po +++ b/l10n/km/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index aa346b34b34..d2cde9a8833 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 59c2ed9d375..2633c90f1f2 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "앱 스토어에서 목록을 가져올 수 없습니다" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "인증 오류" @@ -85,6 +85,39 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음" msgid "Couldn't update app." msgstr "앱을 업데이트할 수 없습니다." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "버전 {appversion}(으)로 업데이트" @@ -129,15 +162,15 @@ msgstr "업데이트" msgid "Updated" msgstr "업데이트됨" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "저장 중..." @@ -461,7 +494,7 @@ msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십 #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "프로필 사진" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index e9b1bff8adc..ac9ed942628 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "نوێکردنه‌وه" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "پاشکه‌وتده‌کات..." diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 7f406ee863e..33639b80d3c 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Konnt Lescht net vum App Store lueden" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Authentifikatioun's Fehler" @@ -85,6 +85,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -129,15 +162,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Speicheren..." diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 23fb315c519..6c51d43a5d0 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 14:50+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,23 +96,23 @@ msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Nenurodytas paveikslėlis ar failas" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Nežinomas failo tipas" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Netinkamas paveikslėlis" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Nėra laikino profilio paveikslėlio, bandykite dar kartą" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Nenurodyti apkirpimo duomenys" #: js/config.php:32 msgid "Sunday" @@ -256,7 +256,7 @@ msgstr "Pasirinkite" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -272,7 +272,7 @@ msgstr "Gerai" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Klaida įkeliant žinutės ruošinį: {error}" #: 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 diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po index 7b189b6247c..811ca96268b 100644 --- a/l10n/lt_LT/lib.po +++ b/l10n/lt_LT/lib.po @@ -4,15 +4,16 @@ # # Translators: # fizikiukas , 2013 +# Liudas Ališauskas , 2013 # Liudas , 2013 # fizikiukas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 14:50+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,15 +59,15 @@ msgstr "Nepavyko pakelti „%s“ versijos." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Saviti profilio paveiksliukai dar neveikia su šifravimu" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Nežinomas failo tipas" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Netinkamas paveikslėlis" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index ce270478859..d651f762750 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentikacijos klaida" @@ -88,6 +88,39 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s" msgid "Couldn't update app." msgstr "Nepavyko atnaujinti programos." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atnaujinti iki {appversion}" @@ -132,15 +165,15 @@ msgstr "Atnaujinti" msgid "Updated" msgstr "Atnaujinta" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Pažymėkite profilio paveikslėlį" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Saugoma..." @@ -464,31 +497,31 @@ msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilio paveikslėlis" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Įkelti naują" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Pasirinkti naują iš failų" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Pašalinti paveikslėlį" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Atšaukti" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Pasirinkite profilio paveiksliuką" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index 5baac49ff31..6649922b22b 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Liudas , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:47-0400\n" -"PO-Revision-Date: 2013-09-12 21:00+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +20,11 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "Nepavyko išvalyti sąsajų." #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Nepavyko pašalinti serverio konfigūracijos" #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" @@ -51,7 +52,7 @@ msgstr "" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Išlaikyti nustatymus?" #: js/settings.js:97 msgid "Cannot add server configuration" @@ -59,11 +60,11 @@ msgstr "" #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "susiejimai išvalyti" #: js/settings.js:112 msgid "Success" -msgstr "" +msgstr "Sėkmingai" #: js/settings.js:117 msgid "Error" @@ -71,19 +72,19 @@ msgstr "Klaida" #: js/settings.js:141 msgid "Connection test succeeded" -msgstr "" +msgstr "Ryšio patikrinimas pavyko" #: js/settings.js:146 msgid "Connection test failed" -msgstr "" +msgstr "Ryšio patikrinimas nepavyko" #: js/settings.js:156 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?" #: js/settings.js:157 msgid "Confirm Deletion" -msgstr "" +msgstr "Patvirtinkite trynimą" #: templates/settings.php:9 msgid "" @@ -100,11 +101,11 @@ msgstr "" #: templates/settings.php:16 msgid "Server configuration" -msgstr "" +msgstr "Serverio konfigūravimas" #: templates/settings.php:32 msgid "Add Server Configuration" -msgstr "" +msgstr "Pridėti serverio konfigūraciją" #: templates/settings.php:37 msgid "Host" @@ -117,11 +118,11 @@ msgstr "" #: templates/settings.php:40 msgid "Base DN" -msgstr "" +msgstr "Bazinis DN" #: templates/settings.php:41 msgid "One Base DN per line" -msgstr "" +msgstr "Vienas bazinis DN eilutėje" #: templates/settings.php:42 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -129,7 +130,7 @@ msgstr "" #: templates/settings.php:44 msgid "User DN" -msgstr "" +msgstr "Naudotojas DN" #: templates/settings.php:46 msgid "" @@ -144,11 +145,11 @@ msgstr "Slaptažodis" #: templates/settings.php:50 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuščius." #: templates/settings.php:51 msgid "User Login Filter" -msgstr "" +msgstr "Naudotojo prisijungimo filtras" #: templates/settings.php:54 #, php-format @@ -159,7 +160,7 @@ msgstr "" #: templates/settings.php:55 msgid "User List Filter" -msgstr "" +msgstr "Naudotojo sąrašo filtras" #: templates/settings.php:58 msgid "" @@ -179,15 +180,15 @@ msgstr "" #: templates/settings.php:66 msgid "Connection Settings" -msgstr "" +msgstr "Ryšio nustatymai" #: templates/settings.php:68 msgid "Configuration Active" -msgstr "" +msgstr "Konfigūracija aktyvi" #: templates/settings.php:68 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Kai nepažymėta, ši konfigūracija bus praleista." #: templates/settings.php:69 msgid "Port" @@ -195,7 +196,7 @@ msgstr "Prievadas" #: templates/settings.php:70 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Atsarginės kopijos (Replica) mazgas" #: templates/settings.php:70 msgid "" @@ -205,15 +206,15 @@ msgstr "" #: templates/settings.php:71 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Atsarginės kopijos (Replica) prievadas" #: templates/settings.php:72 msgid "Disable Main Server" -msgstr "" +msgstr "Išjungti pagrindinį serverį" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Tik prisijungti prie reprodukcinio (replica) serverio." #: templates/settings.php:73 msgid "Use TLS" @@ -248,7 +249,7 @@ msgstr "" #: templates/settings.php:78 msgid "Directory Settings" -msgstr "" +msgstr "Katalogo nustatymai" #: templates/settings.php:80 msgid "User Display Name Field" @@ -260,7 +261,7 @@ msgstr "" #: templates/settings.php:81 msgid "Base User Tree" -msgstr "" +msgstr "Bazinis naudotojo medis" #: templates/settings.php:81 msgid "One User Base DN per line" @@ -268,7 +269,7 @@ msgstr "" #: templates/settings.php:82 msgid "User Search Attributes" -msgstr "" +msgstr "Naudotojo paieškos atributai" #: templates/settings.php:82 templates/settings.php:85 msgid "Optional; one attribute per line" @@ -284,7 +285,7 @@ msgstr "" #: templates/settings.php:84 msgid "Base Group Tree" -msgstr "" +msgstr "Bazinis grupės medis" #: templates/settings.php:84 msgid "One Group Base DN per line" @@ -292,35 +293,35 @@ msgstr "" #: templates/settings.php:85 msgid "Group Search Attributes" -msgstr "" +msgstr "Grupės paieškos atributai" #: templates/settings.php:86 msgid "Group-Member association" -msgstr "" +msgstr "Grupės-Nario sąsaja" #: templates/settings.php:88 msgid "Special Attributes" -msgstr "" +msgstr "Specialūs atributai" #: templates/settings.php:90 msgid "Quota Field" -msgstr "" +msgstr "Kvotos laukas" #: templates/settings.php:91 msgid "Quota Default" -msgstr "" +msgstr "Numatyta kvota" #: templates/settings.php:91 msgid "in bytes" -msgstr "" +msgstr "baitais" #: templates/settings.php:92 msgid "Email Field" -msgstr "" +msgstr "El. pašto laukas" #: templates/settings.php:93 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Naudotojo namų aplanko pavadinimo taisyklė" #: templates/settings.php:93 msgid "" @@ -330,7 +331,7 @@ msgstr "" #: templates/settings.php:98 msgid "Internal Username" -msgstr "" +msgstr "Vidinis naudotojo vardas" #: templates/settings.php:99 msgid "" @@ -350,11 +351,11 @@ msgstr "" #: templates/settings.php:100 msgid "Internal Username Attribute:" -msgstr "" +msgstr "Vidinis naudotojo vardo atributas:" #: templates/settings.php:101 msgid "Override UUID detection" -msgstr "" +msgstr "Perrašyti UUID aptikimą" #: templates/settings.php:102 msgid "" @@ -369,11 +370,11 @@ msgstr "" #: templates/settings.php:103 msgid "UUID Attribute:" -msgstr "" +msgstr "UUID atributas:" #: templates/settings.php:104 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "Naudotojo vardo - LDAP naudotojo sąsaja" #: templates/settings.php:105 msgid "" @@ -391,15 +392,15 @@ msgstr "" #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "Išvalyti naudotojo vardo - LDAP naudotojo sąsają" #: templates/settings.php:106 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają" #: templates/settings.php:108 msgid "Test Configuration" -msgstr "" +msgstr "Bandyti konfigūraciją" #: templates/settings.php:108 msgid "Help" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index f04b2af573e..9f3e95c7174 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentifikācijas kļūda" @@ -85,6 +85,39 @@ msgstr "Nevar izņemt lietotāju no grupas %s" msgid "Couldn't update app." msgstr "Nevarēja atjaunināt lietotni." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atjaunināt uz {appversion}" @@ -129,15 +162,15 @@ msgstr "Atjaunināt" msgid "Updated" msgstr "Atjaunināta" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Saglabā..." diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 38fa0d44ed1..78ab0823ab6 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Неможам да вчитам листа од App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Грешка во автентикација" @@ -84,6 +84,39 @@ msgstr "Неможе да избришам корисник од група %s" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "Ажурирај" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Снимам..." @@ -460,7 +493,7 @@ msgstr "Пополни ја адресата за е-пошта за да мож #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Фотографија за профил" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index 860543d0984..eacef25fc6b 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index 96dcca28a93..f4ab52b45c1 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Ralat pengesahan" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "Kemaskini" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Simpan..." @@ -460,7 +493,7 @@ msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Gambar profil" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index 985e6ce0a42..f8cd38d9c5e 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "ခွင့်ပြုချက်မအောင်မြင်" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index ff63353afc0..55c24f51b9d 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Lasting av liste fra App Store feilet." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentiseringsfeil" @@ -86,6 +86,39 @@ msgstr "Kan ikke slette bruker fra gruppen %s" msgid "Couldn't update app." msgstr "Kunne ikke oppdatere app." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Oppdater til {appversion}" @@ -130,15 +163,15 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Lagrer..." @@ -462,7 +495,7 @@ msgstr "Oppi epostadressen du vil tilbakestille passordet for" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbilde" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index c3ea7fab118..0a5f4dc015a 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 5212bcfb804..42fe772e224 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: André Koot \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" @@ -31,28 +31,28 @@ msgstr "groep" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Onderhoudsmodus ingeschakeld" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Onderhoudsmodus uitgeschakeld" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Database bijgewerkt" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Bijwerken bestandscache. Dit kan even duren..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Bestandscache bijgewerkt" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% gereed ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -95,23 +95,23 @@ msgstr "Verwijderen %s van favorieten is mislukt." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Geen afbeelding of bestand opgegeven" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Onbekend bestandsformaat" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Ongeldige afbeelding" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Geen bijsnijdingsgegevens opgegeven" #: js/config.php:32 msgid "Sunday" @@ -251,7 +251,7 @@ msgstr "Kies" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Fout bij laden bestandenselecteur sjabloon: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -267,7 +267,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Fout bij laden berichtensjabloon: {error}" #: 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 diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index 2c3f2413cdb..918f3b09a7a 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: André Koot \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" @@ -25,7 +25,7 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud." #: app.php:250 msgid "No app name specified" @@ -58,15 +58,15 @@ msgstr "Upgrade \"%s\" mislukt." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Maatwerk profielafbeelding werkt nog niet met versleuteling" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Onbekend bestandsformaat" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Ongeldige afbeelding" #: defaults.php:35 msgid "web services under your control" @@ -101,59 +101,59 @@ msgstr "Download de bestanden in kleinere brokken, appart of vraag uw administra #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Geen bron opgegeven bij installatie van de app" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Geen href opgegeven bij installeren van de app vanaf http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Archiefbestanden van type %s niet ondersteund" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Kon archiefbestand bij installatie van de app niet openen" #: installer.php:125 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "De app heeft geen info.xml bestand" #: installer.php:131 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "De app kan niet worden geïnstalleerd wegens onjuiste code in de app" #: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud" #: installer.php:146 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "De app kan niet worden geïnstallerd omdat het de true tag bevat die niet is toegestaan voor niet gepubliceerde apps" #: installer.php:152 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld" #: installer.php:162 msgid "App directory already exists" -msgstr "" +msgstr "App directory bestaat al" #: installer.php:175 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Kan de app map niet aanmaken, Herstel de permissies. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 96f0a92125e..1baf2c7cab2 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "Kan de lijst niet van de App store laden" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Authenticatie fout" @@ -88,6 +88,39 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s" msgid "Couldn't update app." msgstr "Kon de app niet bijwerken." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Bijwerken naar {appversion}" @@ -132,15 +165,15 @@ msgstr "Bijwerken" msgid "Updated" msgstr "Bijgewerkt" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Kies een profielafbeelding" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Opslaan" @@ -464,31 +497,31 @@ msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profielafbeelding" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Upload een nieuwe" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Selecteer een nieuwe vanuit bestanden" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Verwijder afbeelding" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Afbreken" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Kies als profielafbeelding" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 50ceb17f76c..8fa98b0bea8 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -25,7 +25,7 @@ msgid "Unable to load list from App Store" msgstr "Klarer ikkje å lasta inn liste fra app-butikken" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Autentiseringsfeil" @@ -87,6 +87,39 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s" msgid "Couldn't update app." msgstr "Klarte ikkje oppdatera programmet." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Oppdater til {appversion}" @@ -131,15 +164,15 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Lagrar …" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 8faee77648b..4c9ef40f604 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index bbc9fecb0b7..ed8d2ec20a2 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Pas possible de cargar la tièra dempuèi App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Error d'autentificacion" @@ -84,6 +84,39 @@ msgstr "Pas capable de tira un usancièr del grop %s" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Enregistra..." diff --git a/l10n/pa/core.po b/l10n/pa/core.po new file mode 100644 index 00000000000..695b684902f --- /dev/null +++ b/l10n/pa/core.po @@ -0,0 +1,672 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# A S Alam , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: A S Alam \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:97 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: ajax/share.php:227 +msgid "group" +msgstr "" + +#: ajax/update.php:11 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:14 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:17 +msgid "Updated database" +msgstr "" + +#: ajax/update.php:20 +msgid "Updating filecache, this may take really long..." +msgstr "" + +#: ajax/update.php:23 +msgid "Updated filecache" +msgstr "" + +#: ajax/update.php:26 +#, php-format +msgid "... %d%% done ..." +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: avatar/controller.php:62 +msgid "No image or file provided" +msgstr "" + +#: avatar/controller.php:81 +msgid "Unknown filetype" +msgstr "" + +#: avatar/controller.php:85 +msgid "Invalid image" +msgstr "" + +#: avatar/controller.php:115 avatar/controller.php:142 +msgid "No temporary profile picture available, try again" +msgstr "" + +#: avatar/controller.php:135 +msgid "No crop data provided" +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "ਐਤਵਾਰ" + +#: js/config.php:33 +msgid "Monday" +msgstr "ਸੋਮਵਾਰ" + +#: js/config.php:34 +msgid "Tuesday" +msgstr "ਮੰਗਲਵਾਰ" + +#: js/config.php:35 +msgid "Wednesday" +msgstr "ਬੁੱਧਵਾਰ" + +#: js/config.php:36 +msgid "Thursday" +msgstr "ਵੀਰਵਾਰ" + +#: js/config.php:37 +msgid "Friday" +msgstr "ਸ਼ੁੱਕਰਵਾਰ" + +#: js/config.php:38 +msgid "Saturday" +msgstr "ਸ਼ਨਿੱਚਰਵਾਰ" + +#: js/config.php:43 +msgid "January" +msgstr "ਜਨਵਰੀ" + +#: js/config.php:44 +msgid "February" +msgstr "ਫਰਵਰੀ" + +#: js/config.php:45 +msgid "March" +msgstr "ਮਾਰਚ" + +#: js/config.php:46 +msgid "April" +msgstr "ਅਪਰੈ" + +#: js/config.php:47 +msgid "May" +msgstr "ਮਈ" + +#: js/config.php:48 +msgid "June" +msgstr "ਜੂਨ" + +#: js/config.php:49 +msgid "July" +msgstr "ਜੁਲਾਈ" + +#: js/config.php:50 +msgid "August" +msgstr "ਅਗਸਤ" + +#: js/config.php:51 +msgid "September" +msgstr "ਸਤੰਬ" + +#: js/config.php:52 +msgid "October" +msgstr "ਅਕਤੂਬਰ" + +#: js/config.php:53 +msgid "November" +msgstr "ਨਵੰਬ" + +#: js/config.php:54 +msgid "December" +msgstr "ਦਸੰਬਰ" + +#: js/js.js:387 +msgid "Settings" +msgstr "ਸੈਟਿੰਗ" + +#: js/js.js:853 +msgid "seconds ago" +msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ" + +#: js/js.js:854 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:855 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:856 +msgid "today" +msgstr "ਅੱਜ" + +#: js/js.js:857 +msgid "yesterday" +msgstr "ਕੱਲ੍ਹ" + +#: js/js.js:858 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:859 +msgid "last month" +msgstr "ਪਿਛਲੇ ਮਹੀਨੇ" + +#: js/js.js:860 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:861 +msgid "months ago" +msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ" + +#: js/js.js:862 +msgid "last year" +msgstr "ਪਿਛਲੇ ਸਾਲ" + +#: js/js.js:863 +msgid "years ago" +msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ" + +#: js/oc-dialogs.js:123 +msgid "Choose" +msgstr "ਚੁਣੋ" + +#: js/oc-dialogs.js:146 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:172 +msgid "Yes" +msgstr "ਹਾਂ" + +#: js/oc-dialogs.js:182 +msgid "No" +msgstr "ਨਹੀਂ" + +#: js/oc-dialogs.js:199 +msgid "Ok" +msgstr "ਠੀਕ ਹੈ" + +#: js/oc-dialogs.js:219 +msgid "Error loading message template: {error}" +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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 +#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:645 js/share.js:657 +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:30 js/share.js:45 js/share.js:87 +msgid "Shared" +msgstr "" + +#: js/share.js:90 +msgid "Share" +msgstr "ਸਾਂਝਾ ਕਰੋ" + +#: js/share.js:131 js/share.js:685 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:149 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:158 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:160 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:183 +msgid "Share with" +msgstr "" + +#: js/share.js:188 +msgid "Share with link" +msgstr "" + +#: js/share.js:191 +msgid "Password protect" +msgstr "" + +#: js/share.js:193 templates/installation.php:57 templates/login.php:26 +msgid "Password" +msgstr "ਪਾਸਵਰ" + +#: js/share.js:198 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:202 +msgid "Email link to person" +msgstr "" + +#: js/share.js:203 +msgid "Send" +msgstr "ਭੇਜੋ" + +#: js/share.js:208 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:209 +msgid "Expiration date" +msgstr "" + +#: js/share.js:242 +msgid "Share via email:" +msgstr "" + +#: js/share.js:245 +msgid "No people found" +msgstr "" + +#: js/share.js:283 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:319 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:340 +msgid "Unshare" +msgstr "" + +#: js/share.js:352 +msgid "can edit" +msgstr "" + +#: js/share.js:354 +msgid "access control" +msgstr "" + +#: js/share.js:357 +msgid "create" +msgstr "" + +#: js/share.js:360 +msgid "update" +msgstr "" + +#: js/share.js:363 +msgid "delete" +msgstr "" + +#: js/share.js:366 +msgid "share" +msgstr "" + +#: js/share.js:400 js/share.js:632 +msgid "Password protected" +msgstr "" + +#: js/share.js:645 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:657 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:672 +msgid "Sending ..." +msgstr "" + +#: js/share.js:683 +msgid "Email sent" +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:62 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:4 +msgid "" +"The link to reset your password has been sent to your email.
      If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.
      If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:12 +msgid "Request failed!
      Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 +#: templates/login.php:19 +msgid "Username" +msgstr "ਯੂਜ਼ਰ-ਨਾਂ" + +#: lostpassword/templates/lostpassword.php:22 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset. If you " +"are not sure what to do, please contact your administrator before you " +"continue. Do you really want to continue?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:24 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +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 templates/layout.user.php:108 +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:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +"Cheers!" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 templates/installation.php:31 +#: templates/installation.php:38 +msgid "Security Warning" +msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ" + +#: templates/installation.php:25 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:26 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:33 +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:39 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:41 +#, php-format +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:47 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:65 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:67 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:77 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:82 templates/installation.php:94 +#: templates/installation.php:105 templates/installation.php:116 +#: templates/installation.php:128 +msgid "will be used" +msgstr "" + +#: templates/installation.php:140 +msgid "Database user" +msgstr "" + +#: templates/installation.php:147 +msgid "Database password" +msgstr "" + +#: templates/installation.php:152 +msgid "Database name" +msgstr "" + +#: templates/installation.php:160 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:167 +msgid "Database host" +msgstr "" + +#: templates/installation.php:175 +msgid "Finish setup" +msgstr "" + +#: templates/layout.user.php:41 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:69 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:32 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:37 +msgid "remember" +msgstr "" + +#: templates/login.php:39 +msgid "Log in" +msgstr "" + +#: templates/login.php:45 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,

      just letting you know that %s shared »%s« with you.
      View it!

      Cheers!" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/pa/files.po b/l10n/pa/files.po new file mode 100644 index 00000000000..54e0656a991 --- /dev/null +++ b/l10n/pa/files.po @@ -0,0 +1,335 @@ +# 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-09-18 11:46-0400\n" +"PO-Revision-Date: 2013-09-17 13:20+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/upload.php:16 ajax/upload.php:45 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:22 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:59 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:66 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:67 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:69 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:70 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:71 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:72 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:73 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:91 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:109 +msgid "Upload failed" +msgstr "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ" + +#: ajax/upload.php:127 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:12 +msgid "Files" +msgstr "ਫਾਇਲਾਂ" + +#: js/file-upload.js:40 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:53 +msgid "Not enough space available" +msgstr "" + +#: js/file-upload.js:91 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:206 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:280 +msgid "URL cannot be empty." +msgstr "" + +#: js/file-upload.js:285 lib/app.php:53 +msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" +msgstr "" + +#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +msgid "Error" +msgstr "ਗਲਤੀ" + +#: js/fileactions.js:116 +msgid "Share" +msgstr "ਸਾਂਝਾ ਕਰੋ" + +#: js/fileactions.js:126 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:192 +msgid "Rename" +msgstr "ਨਾਂ ਬਦਲੋ" + +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +msgid "Pending" +msgstr "" + +#: js/filelist.js:417 js/filelist.js:419 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:417 js/filelist.js:419 +msgid "replace" +msgstr "" + +#: js/filelist.js:417 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:417 js/filelist.js:419 +msgid "cancel" +msgstr "" + +#: js/filelist.js:464 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:464 +msgid "undo" +msgstr "ਵਾਪਸ" + +#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:542 +msgid "{dirs} and {files}" +msgstr "" + +#: js/filelist.js:698 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:763 +msgid "files uploading" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:94 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/files.js:322 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:579 templates/index.php:61 +msgid "Name" +msgstr "" + +#: js/files.js:580 templates/index.php:73 +msgid "Size" +msgstr "" + +#: js/files.js:581 templates/index.php:75 +msgid "Modified" +msgstr "" + +#: lib/app.php:73 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:11 templates/index.php:17 +msgid "Upload" +msgstr "ਅੱਪਲੋਡ" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:6 +msgid "New" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:11 +msgid "Folder" +msgstr "" + +#: templates/index.php:13 +msgid "From link" +msgstr "" + +#: templates/index.php:33 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:39 +msgid "Cancel upload" +msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + +#: templates/index.php:45 +msgid "You don’t have write permissions here." +msgstr "" + +#: templates/index.php:50 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:67 +msgid "Download" +msgstr "ਡਾਊਨਲੋਡ" + +#: templates/index.php:80 templates/index.php:81 +msgid "Unshare" +msgstr "" + +#: templates/index.php:86 templates/index.php:87 +msgid "Delete" +msgstr "ਹਟਾਓ" + +#: templates/index.php:100 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:102 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:107 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:110 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po new file mode 100644 index 00000000000..c49ed353a6c --- /dev/null +++ b/l10n/pa/files_encryption.po @@ -0,0 +1,176 @@ +# 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-09-18 11:46-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:51 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:53 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:7 +msgid "" +"Your private key is not valid! Likely your password was changed outside the " +"ownCloud system (e.g. your corporate directory). You can update your private" +" key password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: hooks/hooks.php:53 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:54 +msgid "" +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " +"together with the PHP extension is enabled and configured properly. For now," +" the encryption app has been disabled." +msgstr "" + +#: hooks/hooks.php:255 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/settings-admin.js:11 +msgid "Saving..." +msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +#: templates/invalid_private_key.php:5 +msgid "" +"Your private key is not valid! Maybe the your password was changed from " +"outside." +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "You can unlock your private key in your " +msgstr "" + +#: templates/invalid_private_key.php:7 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:5 templates/settings-personal.php:4 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:10 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:14 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:21 templates/settings-personal.php:54 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:29 templates/settings-personal.php:62 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:34 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:41 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:48 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:53 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:14 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:16 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:24 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:30 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:35 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:45 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:47 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:63 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:64 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po new file mode 100644 index 00000000000..95660c84dbc --- /dev/null +++ b/l10n/pa/files_external.po @@ -0,0 +1,123 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:65 js/google.js:86 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:101 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:42 js/google.js:121 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:453 +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:457 +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 "" + +#: lib/config.php:460 +msgid "" +"Warning: The Curl support in PHP is not enabled or installed. " +"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " +"your system administrator to install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:9 templates/settings.php:28 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:10 +msgid "External storage" +msgstr "" + +#: templates/settings.php:11 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:12 +msgid "Options" +msgstr "" + +#: templates/settings.php:13 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:33 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:90 +msgid "None set" +msgstr "" + +#: templates/settings.php:91 +msgid "All Users" +msgstr "" + +#: templates/settings.php:92 +msgid "Groups" +msgstr "ਗਰੁੱਪ" + +#: templates/settings.php:100 +msgid "Users" +msgstr "" + +#: templates/settings.php:113 templates/settings.php:114 +#: templates/settings.php:149 templates/settings.php:150 +msgid "Delete" +msgstr "ਹਟਾਓ" + +#: templates/settings.php:129 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:130 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:141 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:159 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po new file mode 100644 index 00000000000..5857f609be9 --- /dev/null +++ b/l10n/pa/files_sharing.po @@ -0,0 +1,80 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:20+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:7 +msgid "Password" +msgstr "ਪਾਸਵਰ" + +#: templates/authenticate.php:9 +msgid "Submit" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:15 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:18 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:26 templates/public.php:92 +msgid "Download" +msgstr "ਡਾਊਨਲੋਡ" + +#: templates/public.php:43 templates/public.php:46 +msgid "Upload" +msgstr "ਅੱਪਲੋਡ" + +#: templates/public.php:56 +msgid "Cancel upload" +msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + +#: templates/public.php:89 +msgid "No preview available for" +msgstr "" diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po new file mode 100644 index 00000000000..b6c92523c50 --- /dev/null +++ b/l10n/pa/files_trashbin.po @@ -0,0 +1,84 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:42 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:42 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:102 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 +msgid "Error" +msgstr "ਗਲਤੀ" + +#: js/trash.js:37 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:129 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:190 templates/index.php:21 +msgid "Name" +msgstr "" + +#: js/trash.js:191 templates/index.php:31 +msgid "Deleted" +msgstr "" + +#: js/trash.js:199 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/trash.js:205 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: lib/trash.php:814 lib/trash.php:816 +msgid "restored" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:24 templates/index.php:26 +msgid "Restore" +msgstr "" + +#: templates/index.php:34 templates/index.php:35 +msgid "Delete" +msgstr "ਹਟਾਓ" + +#: templates/part.breadcrumb.php:9 +msgid "Deleted Files" +msgstr "" diff --git a/l10n/pa/files_versions.po b/l10n/pa/files_versions.po new file mode 100644 index 00000000000..92bc707a3d6 --- /dev/null +++ b/l10n/pa/files_versions.po @@ -0,0 +1,43 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-16 20:50+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:7 +msgid "Versions" +msgstr "" + +#: js/versions.js:53 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:79 +msgid "More versions..." +msgstr "" + +#: js/versions.js:116 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:145 +msgid "Restore" +msgstr "" diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po new file mode 100644 index 00000000000..6747e51ba07 --- /dev/null +++ b/l10n/pa/lib.po @@ -0,0 +1,334 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:239 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: app.php:250 +msgid "No app name specified" +msgstr "" + +#: app.php:361 +msgid "Help" +msgstr "" + +#: app.php:374 +msgid "Personal" +msgstr "" + +#: app.php:385 +msgid "Settings" +msgstr "ਸੈਟਿੰਗ" + +#: app.php:397 +msgid "Users" +msgstr "" + +#: app.php:410 +msgid "Admin" +msgstr "" + +#: app.php:839 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: avatar.php:56 +msgid "Custom profile pictures don't work with encryption yet" +msgstr "" + +#: avatar.php:64 +msgid "Unknown filetype" +msgstr "" + +#: avatar.php:69 +msgid "Invalid image" +msgstr "" + +#: defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:227 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:228 files.php:256 +msgid "Back to Files" +msgstr "" + +#: files.php:253 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: installer.php:63 +msgid "No source specified when installing app" +msgstr "" + +#: installer.php:70 +msgid "No href specified when installing app from http" +msgstr "" + +#: installer.php:75 +msgid "No path specified when installing app from local file" +msgstr "" + +#: installer.php:89 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: installer.php:103 +msgid "Failed to open archive when installing app" +msgstr "" + +#: installer.php:125 +msgid "App does not provide an info.xml file" +msgstr "" + +#: installer.php:131 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: installer.php:140 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: installer.php:146 +msgid "" +"App can't be installed because it contains the true tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: installer.php:152 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: installer.php:162 +msgid "App directory already exists" +msgstr "" + +#: installer.php:175 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "ਫਾਇਲਾਂ" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup/abstractdatabase.php:22 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup/abstractdatabase.php:25 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup/abstractdatabase.php:28 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114 +#: setup/postgresql.php:24 setup/postgresql.php:70 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup/mysql.php:12 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147 +#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181 +#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204 +#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115 +#: setup/postgresql.php:125 setup/postgresql.php:134 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148 +#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190 +#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99 +#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup/mysql.php:85 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup/mysql.php:86 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup/mysql.php:91 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup/mysql.php:92 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: setup/oci.php:41 setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup/oci.php:173 setup/oci.php:205 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup/postgresql.php:23 setup/postgresql.php:69 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: setup.php:184 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:185 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template/functions.php:96 +msgid "seconds ago" +msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ" + +#: template/functions.php:97 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:98 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:99 +msgid "today" +msgstr "ਅੱਜ" + +#: template/functions.php:100 +msgid "yesterday" +msgstr "ਕੱਲ੍ਹ" + +#: template/functions.php:101 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:102 +msgid "last month" +msgstr "ਪਿਛਲੇ ਮਹੀਨੇ" + +#: template/functions.php:103 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: template/functions.php:104 +msgid "last year" +msgstr "ਪਿਛਲੇ ਸਾਲ" + +#: template/functions.php:105 +msgid "years ago" +msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ" + +#: template.php:297 +msgid "Caused by:" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po new file mode 100644 index 00000000000..66a45889956 --- /dev/null +++ b/l10n/pa/settings.po @@ -0,0 +1,606 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# A S Alam , 2013 +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your display name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "ਭਾਸ਼ਾ ਬਦਲੀ" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + +#: js/apps.js:43 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +msgid "Disable" +msgstr "ਬੰਦ" + +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +msgid "Enable" +msgstr "ਚਾਲੂ" + +#: js/apps.js:71 +msgid "Please wait...." +msgstr "...ਉਡੀਕੋ ਜੀ" + +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:123 +msgid "Updating...." +msgstr "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + +#: js/apps.js:126 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:126 +msgid "Error" +msgstr "ਗਲਤੀ" + +#: js/apps.js:127 templates/apps.php:43 +msgid "Update" +msgstr "" + +#: js/apps.js:130 +msgid "Updated" +msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" + +#: js/personal.js:220 +msgid "Select a profile picture" +msgstr "" + +#: js/personal.js:265 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:287 +msgid "Saving..." +msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +#: js/users.js:47 +msgid "deleted" +msgstr "ਹਟਾਈ" + +#: js/users.js:47 +msgid "undo" +msgstr "ਵਾਪਸ" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:92 templates/users.php:26 templates/users.php:90 +#: templates/users.php:118 +msgid "Groups" +msgstr "ਗਰੁੱਪ" + +#: js/users.js:97 templates/users.php:92 templates/users.php:130 +msgid "Group Admin" +msgstr "ਗਰੁੱਪ ਐਡਮਿਨ" + +#: js/users.js:120 templates/users.php:170 +msgid "Delete" +msgstr "ਹਟਾਓ" + +#: js/users.js:277 +msgid "add group" +msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ" + +#: js/users.js:436 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:437 js/users.js:443 js/users.js:458 +msgid "Error creating user" +msgstr "" + +#: js/users.js:442 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:45 personal.php:46 +msgid "__language_name__" +msgstr "__ਭਾਸ਼ਾ_ਨਾਂ__" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:63 +#, php-format +msgid "" +"System locale can't be set to %s. This means that there might be problems " +"with certain characters in file names. We strongly suggest to install the " +"required packages on your system to support %s." +msgstr "" + +#: templates/admin.php:75 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:92 +msgid "Cron" +msgstr "" + +#: templates/admin.php:99 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"cron.php is registered at a webcron service to call cron.php once a minute " +"over http." +msgstr "" + +#: templates/admin.php:115 +msgid "Use systems cron service to call the cron.php file once a minute." +msgstr "" + +#: templates/admin.php:120 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:126 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:127 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:134 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:135 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:143 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:144 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:152 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:153 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:160 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:163 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:170 +msgid "Security" +msgstr "" + +#: templates/admin.php:183 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:185 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:191 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:203 +msgid "Log" +msgstr "" + +#: templates/admin.php:204 +msgid "Log level" +msgstr "" + +#: templates/admin.php:235 +msgid "More" +msgstr "" + +#: templates/admin.php:236 +msgid "Less" +msgstr "" + +#: templates/admin.php:242 templates/personal.php:161 +msgid "Version" +msgstr "" + +#: templates/admin.php:246 templates/personal.php:164 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:13 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:28 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:33 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:39 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:41 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:39 templates/users.php:23 templates/users.php:89 +msgid "Password" +msgstr "ਪਾਸਵਰ" + +#: templates/personal.php:40 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:41 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:44 +msgid "New password" +msgstr "" + +#: templates/personal.php:46 +msgid "Change password" +msgstr "ਪਾਸਵਰਡ ਬਦਲੋ" + +#: templates/personal.php:58 templates/users.php:88 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:73 +msgid "Email" +msgstr "" + +#: templates/personal.php:75 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:76 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:86 +msgid "Profile picture" +msgstr "" + +#: templates/personal.php:90 +msgid "Upload new" +msgstr "" + +#: templates/personal.php:92 +msgid "Select new from Files" +msgstr "" + +#: templates/personal.php:93 +msgid "Remove image" +msgstr "" + +#: templates/personal.php:94 +msgid "Either png or jpg. Ideally square but you will be able to crop it." +msgstr "" + +#: templates/personal.php:97 +msgid "Abort" +msgstr "" + +#: templates/personal.php:98 +msgid "Choose as profile image" +msgstr "" + +#: templates/personal.php:106 templates/personal.php:107 +msgid "Language" +msgstr "" + +#: templates/personal.php:119 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:125 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:127 +#, php-format +msgid "" +"Use this address to access your Files via WebDAV" +msgstr "" + +#: templates/personal.php:138 +msgid "Encryption" +msgstr "" + +#: templates/personal.php:140 +msgid "The encryption app is no longer enabled, decrypt all your file" +msgstr "" + +#: templates/personal.php:146 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:151 +msgid "Decrypt all Files" +msgstr "" + +#: templates/users.php:21 +msgid "Login Name" +msgstr "" + +#: templates/users.php:30 +msgid "Create" +msgstr "" + +#: templates/users.php:36 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:48 templates/users.php:148 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:66 templates/users.php:163 +msgid "Other" +msgstr "" + +#: templates/users.php:87 +msgid "Username" +msgstr "ਯੂਜ਼ਰ-ਨਾਂ" + +#: templates/users.php:94 +msgid "Storage" +msgstr "" + +#: templates/users.php:108 +msgid "change display name" +msgstr "" + +#: templates/users.php:112 +msgid "set new password" +msgstr "" + +#: templates/users.php:143 +msgid "Default" +msgstr "" diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po new file mode 100644 index 00000000000..0c8fff50398 --- /dev/null +++ b/l10n/pa/user_ldap.po @@ -0,0 +1,406 @@ +# 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-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:111 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:112 +msgid "Success" +msgstr "" + +#: js/settings.js:117 +msgid "Error" +msgstr "ਗਲਤੀ" + +#: js/settings.js:141 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:146 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:156 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:157 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:9 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:12 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:16 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:32 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:37 +msgid "Host" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:40 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:41 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:42 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:44 +msgid "User DN" +msgstr "" + +#: templates/settings.php:46 +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:47 +msgid "Password" +msgstr "ਪਾਸਵਰ" + +#: templates/settings.php:50 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:51 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:54 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:55 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:58 +msgid "" +"Defines the filter to apply, when retrieving users (no placeholders). " +"Example: \"objectClass=person\"" +msgstr "" + +#: templates/settings.php:59 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:62 +msgid "" +"Defines the filter to apply, when retrieving groups (no placeholders). " +"Example: \"objectClass=posixGroup\"" +msgstr "" + +#: templates/settings.php:66 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:68 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:68 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:69 +msgid "Port" +msgstr "" + +#: templates/settings.php:70 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:70 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:71 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:72 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:72 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:73 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:73 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:74 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:75 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:75 +#, php-format +msgid "" +"Not recommended, use it for testing only! If connection only works with this" +" option, import the LDAP server's SSL certificate in your %s server." +msgstr "" + +#: templates/settings.php:76 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:76 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:78 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:80 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:80 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:81 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:81 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:82 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:82 templates/settings.php:85 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:83 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:83 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:84 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:84 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:85 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:86 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:88 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:90 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:91 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:91 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:92 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:93 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:93 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:98 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:99 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:100 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:101 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:102 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:103 +msgid "UUID Attribute:" +msgstr "" + +#: templates/settings.php:104 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:105 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:106 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" + +#: templates/settings.php:108 +msgid "Test Configuration" +msgstr "" + +#: templates/settings.php:108 +msgid "Help" +msgstr "" diff --git a/l10n/pa/user_webdavauth.po b/l10n/pa/user_webdavauth.po new file mode 100644 index 00000000000..ffc527fb288 --- /dev/null +++ b/l10n/pa/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-16 20:50+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "Address: " +msgstr "" + +#: templates/settings.php:7 +msgid "" +"The user credentials will be sent to this address. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index d0f1cfcc15d..ae9f4924213 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Nie można wczytać listy aplikacji" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Błąd uwierzytelniania" @@ -86,6 +86,39 @@ msgstr "Nie można usunąć użytkownika z grupy %s" msgid "Couldn't update app." msgstr "Nie można uaktualnić aplikacji." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizacja do {appversion}" @@ -130,15 +163,15 @@ msgstr "Aktualizuj" msgid "Updated" msgstr "Zaktualizowano" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Zapisywanie..." @@ -462,7 +495,7 @@ msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Zdjęcie profilu" #: templates/personal.php:90 msgid "Upload new" @@ -482,7 +515,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Anuluj" #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index f8c924a9475..ad96fabaeba 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,23 +94,23 @@ msgstr "Erro ao remover %s dos favoritos." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Nenhuma imagem ou arquivo fornecido" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo de arquivo desconhecido" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Sem imagem no perfil temporário disponível, tente novamente" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Nenhum dado para coleta foi fornecido" #: js/config.php:32 msgid "Sunday" @@ -250,7 +250,7 @@ msgstr "Escolha" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Erro no seletor de carregamento modelo de arquivos: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -266,7 +266,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Erro no carregamento de modelo de mensagem: {error}" #: 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 diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index 31eb50030d0..31597994949 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,15 +56,15 @@ msgstr "Falha na atualização de \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Fotos de perfil personalizados ainda não funcionam com criptografia" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tipo de arquivo desconhecido" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: defaults.php:35 msgid "web services under your control" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index dac1766f084..bfd40a0f931 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Não foi possível carregar lista da App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Erro de autenticação" @@ -86,6 +86,39 @@ msgstr "Não foi possível remover usuário do grupo %s" msgid "Couldn't update app." msgstr "Não foi possível atualizar a app." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atualizar para {appversion}" @@ -130,15 +163,15 @@ msgstr "Atualizar" msgid "Updated" msgstr "Atualizado" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Selecione uma imagem para o perfil" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Salvando..." @@ -462,31 +495,31 @@ msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Imagem para o perfil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Enviar nova foto" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Selecinar uma nova dos Arquivos" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Remover imagem" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Escolha como imagem para o perfil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 62b80e989ca..240d92edaf7 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "Incapaz de carregar a lista da App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Erro na autenticação" @@ -88,6 +88,39 @@ msgstr "Impossível apagar utilizador do grupo %s" msgid "Couldn't update app." msgstr "Não foi possível actualizar a aplicação." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizar para a versão {appversion}" @@ -132,15 +165,15 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "A guardar..." @@ -464,7 +497,7 @@ msgstr "Preencha com o seu endereço de email para ativar a recuperação da pal #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Foto do perfil" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 7e003bd6db6..1016778fe33 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "Imposibil de actualizat lista din App Store." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Eroare la autentificare" @@ -85,6 +85,39 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s" msgid "Couldn't update app." msgstr "Aplicaţia nu s-a putut actualiza." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizat la {versiuneaaplicaţiei}" @@ -129,15 +162,15 @@ msgstr "Actualizare" msgid "Updated" msgstr "Actualizat" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Se salvează..." diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 1d7aae06c0f..edaeaf19326 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -29,7 +29,7 @@ msgid "Unable to load list from App Store" msgstr "Не удалось загрузить список из App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Ошибка аутентификации" @@ -91,6 +91,39 @@ msgstr "Невозможно удалить пользователя из гру msgid "Couldn't update app." msgstr "Невозможно обновить приложение" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Обновить до {версия приложения}" @@ -135,15 +168,15 @@ msgstr "Обновить" msgid "Updated" msgstr "Обновлено" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Сохранение..." @@ -467,7 +500,7 @@ msgstr "Введите адрес электронной почты чтобы #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Фото профиля" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index b5b54615582..78e5accf9e1 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "සත්‍යාපන දෝෂයක්" @@ -84,6 +84,39 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "යාවත්කාල කිරීම" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "සුරැකෙමින් පවතී..." diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index f3a34289611..de97d238d76 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 5417b89d08b..000abca08a0 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Nie je možné nahrať zoznam z App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Chyba autentifikácie" @@ -86,6 +86,39 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s" msgid "Couldn't update app." msgstr "Nemožno aktualizovať aplikáciu." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizovať na {appversion}" @@ -130,15 +163,15 @@ msgstr "Aktualizovať" msgid "Updated" msgstr "Aktualizované" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Ukladám..." @@ -462,7 +495,7 @@ msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilová fotka" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index c9e719828cf..4a2acfea748 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -24,7 +24,7 @@ msgid "Unable to load list from App Store" msgstr "Ni mogoče naložiti seznama iz programskega središča" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Napaka med overjanjem" @@ -86,6 +86,39 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s" msgid "Couldn't update app." msgstr "Programa ni mogoče posodobiti." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Posodobi na {appversion}" @@ -130,15 +163,15 @@ msgstr "Posodobi" msgid "Updated" msgstr "Posodobljeno" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Poteka shranjevanje ..." @@ -462,7 +495,7 @@ msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Slika profila" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 1aad69565c5..05680ab5d73 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Veprim i gabuar gjatë vërtetimit të identitetit" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "Azhurno" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index 9f2fe8c7c89..ba7da173f28 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Грешка приликом учитавања списка из Складишта Програма" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Грешка при провери идентитета" @@ -84,6 +84,39 @@ msgstr "Не могу да уклоним корисника из групе %s" msgid "Couldn't update app." msgstr "Не могу да ажурирам апликацију." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Ажурирај на {appversion}" @@ -128,15 +161,15 @@ msgstr "Ажурирај" msgid "Updated" msgstr "Ажурирано" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Чување у току..." diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index cc6f3b2d5bd..28437f33e6d 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Greška pri autentifikaciji" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index bed6751c586..f6ced07827c 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -28,7 +28,7 @@ msgid "Unable to load list from App Store" msgstr "Kan inte ladda listan från App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Fel vid autentisering" @@ -90,6 +90,39 @@ msgstr "Kan inte radera användare från gruppen %s" msgid "Couldn't update app." msgstr "Kunde inte uppdatera appen." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Uppdatera till {appversion}" @@ -134,15 +167,15 @@ msgstr "Uppdatera" msgid "Updated" msgstr "Uppdaterad" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Sparar..." @@ -466,7 +499,7 @@ msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbild" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index 4d21326ffb0..efa55405965 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index 0e74f284b29..c7ece05242c 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "அத்தாட்சிப்படுத்தலில் வழு" @@ -84,6 +84,39 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "இற்றைப்படுத்தல்" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "சேமிக்கப்படுகிறது..." diff --git a/l10n/te/settings.po b/l10n/te/settings.po index 38c9a149cc5..fae385a6340 100644 --- a/l10n/te/settings.po +++ b/l10n/te/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 5f6e94f4ea7..b33795587e7 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 161d9755eb5..eedc0a25df3 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,32 +87,32 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 +#: js/file-upload.js:40 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:53 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:73 +#: js/file-upload.js:91 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:167 +#: js/file-upload.js:206 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:241 +#: js/file-upload.js:280 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:246 lib/app.php:53 +#: js/file-upload.js:285 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:278 js/file-upload.js:294 js/files.js:528 js/files.js:566 +#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 msgid "Error" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 4ecbd811f41..d3bea416f53 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,18 +60,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:51 +#: hooks/hooks.php:53 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:52 +#: hooks/hooks.php:54 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now, " "the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:250 +#: hooks/hooks.php:255 msgid "Following users are not set up for encryption:" msgstr "" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 99b523228e4..e479af01a27 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 864993c2e53..d7f497295db 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 21e54096a87..f64c3dfd3d0 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 013e4ee266d..b0fc9800d2a 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 662cfdfdd6c..d10c7fb9fb3 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 e405f9529ea..3d0cbd90cfc 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,38 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +160,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 28316ceea3b..cce14efa4e1 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 8f3c15b8d88..ea6486423a4 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\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 3426744f01f..6c34842bf4b 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "ไม่สามารถโหลดรายการจาก App Store ได้" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน" @@ -84,6 +84,39 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ msgid "Couldn't update app." msgstr "ไม่สามารถอัพเดทแอปฯ" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "อัพเดทไปเป็นรุ่น {appversion}" @@ -128,15 +161,15 @@ msgstr "อัพเดท" msgid "Updated" msgstr "อัพเดทแล้ว" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "กำลังบันทึกข้อมูล..." @@ -460,7 +493,7 @@ msgstr "กรอกที่อยู่อีเมล์ของคุณเ #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "รูปภาพโปรไฟล์" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index b7a8e838497..473a8a6790c 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -26,7 +26,7 @@ msgid "Unable to load list from App Store" msgstr "App Store'dan liste yüklenemiyor" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Kimlik doğrulama hatası" @@ -88,6 +88,39 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor" msgid "Couldn't update app." msgstr "Uygulama güncellenemedi." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} Güncelle" @@ -132,15 +165,15 @@ msgstr "Güncelleme" msgid "Updated" msgstr "Güncellendi" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir." -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Kaydediliyor..." @@ -464,7 +497,7 @@ msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profil resmi" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index b6ec1cd7f02..63874495c3b 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "سالاھىيەت دەلىللەش خاتالىقى" @@ -85,6 +85,39 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل msgid "Couldn't update app." msgstr "ئەپنى يېڭىلىيالمايدۇ." +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} غا يېڭىلايدۇ" @@ -129,15 +162,15 @@ msgstr "يېڭىلا" msgid "Updated" msgstr "يېڭىلاندى" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "ساقلاۋاتىدۇ…" diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po index d36a9a3a538..46c45f13fea 100644 --- a/l10n/uk/files_encryption.po +++ b/l10n/uk/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 13:31+0000\n" +"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"PO-Revision-Date: 2013-09-17 13:05+0000\n" "Last-Translator: zubr139 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -62,18 +62,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:51 +#: hooks/hooks.php:53 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:52 +#: hooks/hooks.php:54 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:250 +#: hooks/hooks.php:255 msgid "Following users are not set up for encryption:" msgstr "" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 3611f7952d7..53d79864613 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Не вдалося завантажити список з App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Помилка автентифікації" @@ -84,6 +84,39 @@ msgstr "Не вдалося видалити користувача із гру msgid "Couldn't update app." msgstr "Не вдалося оновити програму. " +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Оновити до {appversion}" @@ -128,15 +161,15 @@ msgstr "Оновити" msgid "Updated" msgstr "Оновлено" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Зберігаю..." diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po index b25b14fad21..7f61f7a3e37 100644 --- a/l10n/uk/user_webdavauth.po +++ b/l10n/uk/user_webdavauth.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 13:52+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-17 13:04+0000\n" "Last-Translator: zubr139 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 4c01294a252..92dc0e5d077 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 1297da2664f..37f3d2e0da8 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "Không thể tải danh sách ứng dụng từ App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "Lỗi xác thực" @@ -84,6 +84,39 @@ msgstr "Không thể xóa người dùng từ nhóm %s" msgid "Couldn't update app." msgstr "Không thể cập nhật ứng dụng" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Cập nhật lên {appversion}" @@ -128,15 +161,15 @@ msgstr "Cập nhật" msgid "Updated" msgstr "Đã cập nhật" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "Đang lưu..." diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index f6c57de60cb..2e9ea7f2a6d 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -27,7 +27,7 @@ msgid "Unable to load list from App Store" msgstr "无法从应用商店载入列表" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "认证出错" @@ -89,6 +89,39 @@ msgstr "无法从组%s中移除用户" msgid "Couldn't update app." msgstr "无法更新 app。" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "更新至 {appversion}" @@ -133,15 +166,15 @@ msgstr "更新" msgid "Updated" msgstr "已更新" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "正在解密文件... 请稍等，可能需要一些时间。" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "保存中" @@ -465,7 +498,7 @@ msgstr "填写电子邮件地址以启用密码恢复功能" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "联系人图片" #: templates/personal.php:90 msgid "Upload new" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index ac0290157fb..03c8c330da4 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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,39 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +161,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 207a0b4670b..e6f825433a8 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"PO-Revision-Date: 2013-09-18 15:47+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" @@ -23,7 +23,7 @@ msgid "Unable to load list from App Store" msgstr "無法從 App Store 讀取清單" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "認證錯誤" @@ -85,6 +85,39 @@ msgstr "使用者移出群組 %s 錯誤" msgid "Couldn't update app." msgstr "無法更新應用程式" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 +msgid "message" +msgstr "" + +#: changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "更新至 {appversion}" @@ -129,15 +162,15 @@ msgstr "更新" msgid "Updated" msgstr "已更新" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "檔案解密中，請稍候。" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "儲存中..." @@ -461,7 +494,7 @@ msgstr "請填入電子郵件信箱以便回復密碼" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "個人資料照片" #: templates/personal.php:90 msgid "Upload new" diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php index 166455e652c..a8769224705 100644 --- a/lib/l10n/ca.php +++ b/lib/l10n/ca.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Usuaris", "Admin" => "Administració", "Failed to upgrade \"%s\"." => "Ha fallat l'actualització \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Les imatges de perfil personals encara no funcionen amb encriptació", +"Unknown filetype" => "Tipus de fitxer desconegut", +"Invalid image" => "Imatge no vàlida", "web services under your control" => "controleu els vostres serveis web", "cannot open \"%s\"" => "no es pot obrir \"%s\"", "ZIP download is turned off." => "La baixada en ZIP està desactivada.", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index fed9ad03c01..ed31ae79529 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Uživatelé", "Admin" => "Administrace", "Failed to upgrade \"%s\"." => "Selhala aktualizace verze \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Vlastní profilové obrázky zatím nefungují v kombinaci se šifrováním", +"Unknown filetype" => "Neznámý typ souboru", +"Invalid image" => "Chybný obrázek", "web services under your control" => "webové služby pod Vaší kontrolou", "cannot open \"%s\"" => "nelze otevřít \"%s\"", "ZIP download is turned off." => "Stahování v ZIPu je vypnuto.", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 7a3e2c43e6b..87e7a67b47b 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Benutzer", "Admin" => "Administration", "Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.", +"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt", +"Unknown filetype" => "Unbekannter Dateityp", +"Invalid image" => "Ungültiges Bild", "web services under your control" => "Web-Services unter Deiner Kontrolle", "cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen", "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 0a72f443e4d..09be0eea22d 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Benutzer", "Admin" => "Administrator", "Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.", +"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt", +"Unknown filetype" => "Unbekannter Dateityp", +"Invalid image" => "Ungültiges Bild", "web services under your control" => "Web-Services unter Ihrer Kontrolle", "cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen", "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.", diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php index f799c071c76..d02f553eda8 100644 --- a/lib/l10n/en_GB.php +++ b/lib/l10n/en_GB.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Users", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Failed to upgrade \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Custom profile pictures don't work with encryption yet", +"Unknown filetype" => "Unknown filetype", +"Invalid image" => "Invalid image", "web services under your control" => "web services under your control", "cannot open \"%s\"" => "cannot open \"%s\"", "ZIP download is turned off." => "ZIP download is turned off.", @@ -54,13 +57,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.", "Please double check the installation guides." => "Please double check the installation guides.", "seconds ago" => "seconds ago", -"_%n minute ago_::_%n minutes ago_" => array("","%n minutes ago"), -"_%n hour ago_::_%n hours ago_" => array("","%n hours ago"), +"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"), +"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"), "today" => "today", "yesterday" => "yesterday", -"_%n day go_::_%n days ago_" => array("","%n days ago"), +"_%n day go_::_%n days ago_" => array("%n day go","%n days ago"), "last month" => "last month", -"_%n month ago_::_%n months ago_" => array("","%n months ago"), +"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"), "last year" => "last year", "years ago" => "years ago", "Caused by:" => "Caused by:", diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index 8e3aa55c4ed..85dfaeb52d5 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Kasutajad", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Ebaõnnestunud uuendus \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga", +"Unknown filetype" => "Tundmatu failitüüp", +"Invalid image" => "Vigane pilt", "web services under your control" => "veebitenused sinu kontrolli all", "cannot open \"%s\"" => "ei suuda avada \"%s\"", "ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.", diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index 2e69df43ad2..1d2bdab749c 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -1,11 +1,16 @@ "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa.", +"No app name specified" => "Sovelluksen nimeä ei määritelty", "Help" => "Ohje", "Personal" => "Henkilökohtainen", "Settings" => "Asetukset", "Users" => "Käyttäjät", "Admin" => "Ylläpitäjä", +"Failed to upgrade \"%s\"." => "Kohteen \"%s\" päivitys epäonnistui.", +"Custom profile pictures don't work with encryption yet" => "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä", +"Unknown filetype" => "Tuntematon tiedostotyyppi", +"Invalid image" => "Virheellinen kuva", "web services under your control" => "verkkopalvelut hallinnassasi", "ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.", "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.", @@ -15,6 +20,8 @@ $TRANSLATIONS = array( "No path specified when installing app from local file" => "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta", "Archives of type %s are not supported" => "Tyypin %s arkistot eivät ole tuettuja", "App does not provide an info.xml file" => "Sovellus ei sisällä info.xml-tiedostoa", +"App can't be installed because of not allowed code in the App" => "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia", +"App can't be installed because it is not compatible with this version of ownCloud" => "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa", "App directory already exists" => "Sovelluskansio on jo olemassa", "Can't create app folder. Please fix permissions. %s" => "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s", "Application is not enabled" => "Sovellusta ei ole otettu käyttöön", diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index a8fee3b1bc1..406272d690f 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Usuarios", "Admin" => "Administración", "Failed to upgrade \"%s\"." => "Non foi posíbel anovar «%s».", +"Custom profile pictures don't work with encryption yet" => "As imaxes personalizadas de perfil aínda non funcionan co cifrado", +"Unknown filetype" => "Tipo de ficheiro descoñecido", +"Invalid image" => "Imaxe incorrecta", "web services under your control" => "servizos web baixo o seu control", "cannot open \"%s\"" => "non foi posíbel abrir «%s»", "ZIP download is turned off." => "As descargas ZIP están desactivadas.", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index c3a040048ec..2dab6dee157 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Utenti", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura.", +"Unknown filetype" => "Tipo file sconosciuto", +"Invalid image" => "Immagine non valida", "web services under your control" => "servizi web nelle tue mani", "cannot open \"%s\"" => "impossibile aprire \"%s\"", "ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.", diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php index 2d37001ca19..746ef17c575 100644 --- a/lib/l10n/ja_JP.php +++ b/lib/l10n/ja_JP.php @@ -8,6 +8,8 @@ $TRANSLATIONS = array( "Users" => "ユーザ", "Admin" => "管理", "Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。", +"Unknown filetype" => "不明なファイルタイプ", +"Invalid image" => "無効な画像", "web services under your control" => "管理下のウェブサービス", "cannot open \"%s\"" => "\"%s\" が開けません", "ZIP download is turned off." => "ZIPダウンロードは無効です。", diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php index 1fd9b9ea634..db8d96c1018 100644 --- a/lib/l10n/lt_LT.php +++ b/lib/l10n/lt_LT.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Vartotojai", "Admin" => "Administravimas", "Failed to upgrade \"%s\"." => "Nepavyko pakelti „%s“ versijos.", +"Custom profile pictures don't work with encryption yet" => "Saviti profilio paveiksliukai dar neveikia su šifravimu", +"Unknown filetype" => "Nežinomas failo tipas", +"Invalid image" => "Netinkamas paveikslėlis", "web services under your control" => "jūsų valdomos web paslaugos", "cannot open \"%s\"" => "nepavyksta atverti „%s“", "ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index e546c1f3179..20374f1f0f8 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -1,5 +1,6 @@ "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud.", "No app name specified" => "De app naam is niet gespecificeerd.", "Help" => "Help", "Personal" => "Persoonlijk", @@ -7,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Gebruikers", "Admin" => "Beheerder", "Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.", +"Custom profile pictures don't work with encryption yet" => "Maatwerk profielafbeelding werkt nog niet met versleuteling", +"Unknown filetype" => "Onbekend bestandsformaat", +"Invalid image" => "Ongeldige afbeelding", "web services under your control" => "Webdiensten in eigen beheer", "cannot open \"%s\"" => "Kon \"%s\" niet openen", "ZIP download is turned off." => "ZIP download is uitgeschakeld.", @@ -14,6 +18,18 @@ $TRANSLATIONS = array( "Back to Files" => "Terug naar bestanden", "Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.", +"No source specified when installing app" => "Geen bron opgegeven bij installatie van de app", +"No href specified when installing app from http" => "Geen href opgegeven bij installeren van de app vanaf http", +"No path specified when installing app from local file" => "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand", +"Archives of type %s are not supported" => "Archiefbestanden van type %s niet ondersteund", +"Failed to open archive when installing app" => "Kon archiefbestand bij installatie van de app niet openen", +"App does not provide an info.xml file" => "De app heeft geen info.xml bestand", +"App can't be installed because of not allowed code in the App" => "De app kan niet worden geïnstalleerd wegens onjuiste code in de app", +"App can't be installed because it is not compatible with this version of ownCloud" => "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "De app kan niet worden geïnstallerd omdat het de true tag bevat die niet is toegestaan voor niet gepubliceerde apps", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld", +"App directory already exists" => "App directory bestaat al", +"Can't create app folder. Please fix permissions. %s" => "Kan de app map niet aanmaken, Herstel de permissies. %s", "Application is not enabled" => "De applicatie is niet actief", "Authentication error" => "Authenticatie fout", "Token expired. Please reload page." => "Token verlopen. Herlaad de pagina.", diff --git a/lib/l10n/pa.php b/lib/l10n/pa.php new file mode 100644 index 00000000000..069fea6e710 --- /dev/null +++ b/lib/l10n/pa.php @@ -0,0 +1,16 @@ + "ਸੈਟਿੰਗ", +"Files" => "ਫਾਇਲਾਂ", +"seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ", +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"today" => "ਅੱਜ", +"yesterday" => "ਕੱਲ੍ਹ", +"_%n day go_::_%n days ago_" => array("",""), +"last month" => "ਪਿਛਲੇ ਮਹੀਨੇ", +"_%n month ago_::_%n months ago_" => array("",""), +"last year" => "ਪਿਛਲੇ ਸਾਲ", +"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 72bc1f36a1e..7a580799701 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Usuários", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Falha na atualização de \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Fotos de perfil personalizados ainda não funcionam com criptografia", +"Unknown filetype" => "Tipo de arquivo desconhecido", +"Invalid image" => "Imagem inválida", "web services under your control" => "serviços web sob seu controle", "cannot open \"%s\"" => "não pode abrir \"%s\"", "ZIP download is turned off." => "Download ZIP está desligado.", diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php index 6de7d4518c3..c442fb84b98 100644 --- a/settings/l10n/ca.php +++ b/settings/l10n/ca.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Error", "Update" => "Actualitza", "Updated" => "Actualitzada", +"Select a profile picture" => "Seleccioneu una imatge de perfil", "Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.", "Saving..." => "Desant...", "deleted" => "esborrat", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "Correu electrònic", "Your email address" => "Correu electrònic", "Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya", +"Profile picture" => "Foto de perfil", +"Upload new" => "Puja'n una de nova", +"Select new from Files" => "Selecciona'n una de nova dels fitxers", +"Remove image" => "Elimina imatge", +"Either png or jpg. Ideally square but you will be able to crop it." => "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.", +"Abort" => "Cancel·la", +"Choose as profile image" => "Selecciona com a imatge de perfil", "Language" => "Idioma", "Help translate" => "Ajudeu-nos amb la traducció", "WebDAV" => "WebDAV", diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 09caacbb5ae..7e2ec238465 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Chyba", "Update" => "Aktualizovat", "Updated" => "Aktualizováno", +"Select a profile picture" => "Vyberte profilový obrázek", "Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.", "Saving..." => "Ukládám...", "deleted" => "smazáno", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-mail", "Your email address" => "Vaše e-mailová adresa", "Fill in an email address to enable password recovery" => "Pro povolení obnovy hesla vyplňte e-mailovou adresu", +"Profile picture" => "Profilová fotka", +"Upload new" => "Nahrát nový", +"Select new from Files" => "Vyberte nový ze souborů", +"Remove image" => "Odebrat obrázek", +"Either png or jpg. Ideally square but you will be able to crop it." => "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.", +"Abort" => "Přerušit", +"Choose as profile image" => "Vybrat jako profilový obrázek", "Language" => "Jazyk", "Help translate" => "Pomoci s překladem", "WebDAV" => "WebDAV", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index b34625f75e1..9872d3f5e07 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Fejl", "Update" => "Opdater", "Updated" => "Opdateret", +"Select a profile picture" => "Vælg et profilbillede", "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ", "Saving..." => "Gemmer...", "deleted" => "Slettet", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-mail", "Your email address" => "Din emailadresse", "Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode", +"Profile picture" => "Profilbillede", +"Upload new" => "Upload nyt", +"Select new from Files" => "Vælg nyt fra Filer", +"Remove image" => "Fjern billede", +"Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ", +"Abort" => "Afbryd", +"Choose as profile image" => "Vælg som profilbillede", "Language" => "Sprog", "Help translate" => "Hjælp med oversættelsen", "WebDAV" => "WebDAV", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 87e935a93c6..05c02e530ed 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Fehler", "Update" => "Aktualisierung durchführen", "Updated" => "Aktualisiert", +"Select a profile picture" => "Wähle ein Profilbild", "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.", "Saving..." => "Speichern...", "deleted" => "gelöscht", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-Mail", "Your email address" => "Deine E-Mail-Adresse", "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.", +"Profile picture" => "Profilbild", +"Upload new" => "Neues hochladen", +"Select new from Files" => "Neues aus den Dateien wählen", +"Remove image" => "Bild entfernen", +"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.", +"Abort" => "Abbrechen", +"Choose as profile image" => "Als Profilbild wählen", "Language" => "Sprache", "Help translate" => "Hilf bei der Übersetzung", "WebDAV" => "WebDAV", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 6998b51042b..15511569a18 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Fehler", "Update" => "Update durchführen", "Updated" => "Aktualisiert", +"Select a profile picture" => "Wählen Sie ein Profilbild", "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.", "Saving..." => "Speichern...", "deleted" => "gelöscht", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-Mail", "Your email address" => "Ihre E-Mail-Adresse", "Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.", +"Profile picture" => "Profilbild", +"Upload new" => "Neues hochladen", +"Select new from Files" => "Neues aus den Dateien wählen", +"Remove image" => "Bild entfernen", +"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.", +"Abort" => "Abbrechen", +"Choose as profile image" => "Als Profilbild wählen", "Language" => "Sprache", "Help translate" => "Helfen Sie bei der Übersetzung", "WebDAV" => "WebDAV", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 8daa9ccf8bc..a4876d854df 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -87,6 +87,7 @@ $TRANSLATIONS = array( "Email" => "Ηλ. ταχυδρομείο", "Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας", "Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού", +"Profile picture" => "Φωτογραφία προφίλ", "Language" => "Γλώσσα", "Help translate" => "Βοηθήστε στη μετάφραση", "WebDAV" => "WebDAV", diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php index e1a00643908..edac1152100 100644 --- a/settings/l10n/en_GB.php +++ b/settings/l10n/en_GB.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Error", "Update" => "Update", "Updated" => "Updated", +"Select a profile picture" => "Select a profile picture", "Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.", "Saving..." => "Saving...", "deleted" => "deleted", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "Your email address", "Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery", +"Profile picture" => "Profile picture", +"Upload new" => "Upload new", +"Select new from Files" => "Select new from Files", +"Remove image" => "Remove image", +"Either png or jpg. Ideally square but you will be able to crop it." => "Either png or jpg. Ideally square but you will be able to crop it.", +"Abort" => "Abort", +"Choose as profile image" => "Choose as profile image", "Language" => "Language", "Help translate" => "Help translate", "WebDAV" => "WebDAV", diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php index 6c3adf2ddcb..4c797e1a8dd 100644 --- a/settings/l10n/eo.php +++ b/settings/l10n/eo.php @@ -64,6 +64,7 @@ $TRANSLATIONS = array( "Email" => "Retpoŝto", "Your email address" => "Via retpoŝta adreso", "Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron", +"Profile picture" => "Profila bildo", "Language" => "Lingvo", "Help translate" => "Helpu traduki", "WebDAV" => "WebDAV", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 52610e1c4fe..027bd23c3e1 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -100,6 +100,8 @@ $TRANSLATIONS = array( "Email" => "E-mail", "Your email address" => "Su dirección de correo", "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña", +"Profile picture" => "Foto del perfil", +"Abort" => "Abortar", "Language" => "Idioma", "Help translate" => "Ayúdanos a traducir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index 252692ea4c3..aba4b604a2d 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "e-mail", "Your email address" => "Tu dirección de e-mail", "Fill in an email address to enable password recovery" => "Escribí una dirección de e-mail para restablecer la contraseña", +"Abort" => "Abortar", "Language" => "Idioma", "Help translate" => "Ayudanos a traducir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index d779a36cb9b..0a1b66e6ae6 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Viga", "Update" => "Uuenda", "Updated" => "Uuendatud", +"Select a profile picture" => "Vali profiili pilt", "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.", "Saving..." => "Salvestamine...", "deleted" => "kustutatud", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-post", "Your email address" => "Sinu e-posti aadress", "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress", +"Profile picture" => "Profiili pilt", +"Upload new" => "Laadi uus", +"Select new from Files" => "Vali failidest uus", +"Remove image" => "Eemalda pilt", +"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata.", +"Abort" => "Katkesta", +"Choose as profile image" => "Vali kui profiili pilt", "Language" => "Keel", "Help translate" => "Aita tõlkida", "WebDAV" => "WebDAV", diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 6491c7fc2dd..63a3bf3f62b 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -94,6 +94,7 @@ $TRANSLATIONS = array( "Email" => "E-posta", "Your email address" => "Zure e-posta", "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko", +"Profile picture" => "Profilaren irudia", "Language" => "Hizkuntza", "Help translate" => "Lagundu itzultzen", "WebDAV" => "WebDAV", diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php index 74a49b9b05d..b4ae186e300 100644 --- a/settings/l10n/fa.php +++ b/settings/l10n/fa.php @@ -87,6 +87,7 @@ $TRANSLATIONS = array( "Email" => "ایمیل", "Your email address" => "پست الکترونیکی شما", "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود", +"Profile picture" => "تصویر پروفایل", "Language" => "زبان", "Help translate" => "به ترجمه آن کمک کنید", "WebDAV" => "WebDAV", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index cf2ff5041c1..81ec9b483e9 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Virhe", "Update" => "Päivitä", "Updated" => "Päivitetty", +"Select a profile picture" => "Valitse profiilikuva", "Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.", "Saving..." => "Tallennetaan...", "deleted" => "poistettu", @@ -87,6 +88,13 @@ $TRANSLATIONS = array( "Email" => "Sähköpostiosoite", "Your email address" => "Sähköpostiosoitteesi", "Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa", +"Profile picture" => "Profiilikuva", +"Upload new" => "Lähetä uusi", +"Select new from Files" => "Valitse uusi tiedostoista", +"Remove image" => "Poista kuva", +"Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa.", +"Abort" => "Keskeytä", +"Choose as profile image" => "Valitse profiilikuvaksi", "Language" => "Kieli", "Help translate" => "Auta kääntämisessä", "WebDAV" => "WebDAV", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index d973ab30afd..6b1a829435c 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Erreur", "Update" => "Mettre à jour", "Updated" => "Mise à jour effectuée avec succès", +"Select a profile picture" => "Selectionner une photo de profil ", "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.", "Saving..." => "Enregistrement...", "deleted" => "supprimé", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "Adresse mail", "Your email address" => "Votre adresse e-mail", "Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe", +"Profile picture" => "Photo de profil", +"Upload new" => "Télécharger nouveau", +"Select new from Files" => "Sélectionner un nouveau depuis les documents", +"Remove image" => "Supprimer l'image", +"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer .", +"Abort" => "Abandonner", +"Choose as profile image" => "Choisir en temps que photo de profil ", "Language" => "Langue", "Help translate" => "Aidez à traduire", "WebDAV" => "WebDAV", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index b3e3dfec91b..e2537255fc8 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Erro", "Update" => "Actualizar", "Updated" => "Actualizado", +"Select a profile picture" => "Seleccione unha imaxe para o perfil", "Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.", "Saving..." => "Gardando...", "deleted" => "eliminado", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "Correo", "Your email address" => "O seu enderezo de correo", "Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación", +"Profile picture" => "Imaxe do perfil", +"Upload new" => "Novo envío", +"Select new from Files" => "Seleccione unha nova de ficheiros", +"Remove image" => "Retirar a imaxe", +"Either png or jpg. Ideally square but you will be able to crop it." => "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.", +"Abort" => "Cancelar", +"Choose as profile image" => "Escolla unha imaxe para o perfil", "Language" => "Idioma", "Help translate" => "Axude na tradución", "WebDAV" => "WebDAV", diff --git a/settings/l10n/he.php b/settings/l10n/he.php index 5207a05de10..bdfa7f5699b 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -85,6 +85,7 @@ $TRANSLATIONS = array( "Email" => "דואר אלקטרוני", "Your email address" => "כתובת הדוא״ל שלך", "Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה", +"Profile picture" => "תמונת פרופיל", "Language" => "פה", "Help translate" => "עזרה בתרגום", "WebDAV" => "WebDAV", diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php index 094a9dba298..2c65a26dae5 100644 --- a/settings/l10n/hi.php +++ b/settings/l10n/hi.php @@ -2,8 +2,10 @@ $TRANSLATIONS = array( "Error" => "त्रुटि", "Update" => "अद्यतन", +"Security Warning" => "सुरक्षा चेतावनी ", "Password" => "पासवर्ड", "New password" => "नया पासवर्ड", +"Abort" => "रद्द करना ", "Username" => "प्रयोक्ता का नाम" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index f5a469e3c26..f31826c149f 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -97,6 +97,7 @@ $TRANSLATIONS = array( "Email" => "Email", "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!", +"Profile picture" => "Profilkép", "Language" => "Nyelv", "Help translate" => "Segítsen a fordításban!", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php index 91df05ada3f..b51bc32a2f5 100644 --- a/settings/l10n/ia.php +++ b/settings/l10n/ia.php @@ -19,6 +19,7 @@ $TRANSLATIONS = array( "Change password" => "Cambiar contrasigno", "Email" => "E-posta", "Your email address" => "Tu adresse de e-posta", +"Profile picture" => "Imagine de profilo", "Language" => "Linguage", "Help translate" => "Adjuta a traducer", "Create" => "Crear", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 29594a95dcf..b06fc2a0f67 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Errore", "Update" => "Aggiorna", "Updated" => "Aggiornato", +"Select a profile picture" => "Seleziona un'immagine del profilo", "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.", "Saving..." => "Salvataggio in corso...", "deleted" => "eliminati", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "Posta elettronica", "Your email address" => "Il tuo indirizzo email", "Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password", +"Profile picture" => "Immagine del profilo", +"Upload new" => "Carica nuova", +"Select new from Files" => "Seleziona nuova da file", +"Remove image" => "Rimuovi immagine", +"Either png or jpg. Ideally square but you will be able to crop it." => "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.", +"Abort" => "Interrompi", +"Choose as profile image" => "Scegli come immagine del profilo", "Language" => "Lingua", "Help translate" => "Migliora la traduzione", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 63e83cab4dd..12784e3f537 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "エラー", "Update" => "更新", "Updated" => "更新済み", +"Select a profile picture" => "プロファイル画像を選択", "Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。", "Saving..." => "保存中...", "deleted" => "削除", @@ -100,6 +101,10 @@ $TRANSLATIONS = array( "Email" => "メール", "Your email address" => "あなたのメールアドレス", "Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です", +"Profile picture" => "プロフィール写真", +"Remove image" => "画像を削除", +"Abort" => "中止", +"Choose as profile image" => "プロファイル画像として選択", "Language" => "言語", "Help translate" => "翻訳に協力する", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php index 5feb1d5694f..cbf693d7126 100644 --- a/settings/l10n/ko.php +++ b/settings/l10n/ko.php @@ -87,6 +87,7 @@ $TRANSLATIONS = array( "Email" => "이메일", "Your email address" => "이메일 주소", "Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오", +"Profile picture" => "프로필 사진", "Language" => "언어", "Help translate" => "번역 돕기", "WebDAV" => "WebDAV", diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index 31c9e2be59f..a23d21ed7f7 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Klaida", "Update" => "Atnaujinti", "Updated" => "Atnaujinta", +"Select a profile picture" => "Pažymėkite profilio paveikslėlį", "Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.", "Saving..." => "Saugoma...", "deleted" => "ištrinta", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "El. Paštas", "Your email address" => "Jūsų el. pašto adresas", "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą", +"Profile picture" => "Profilio paveikslėlis", +"Upload new" => "Įkelti naują", +"Select new from Files" => "Pasirinkti naują iš failų", +"Remove image" => "Pašalinti paveikslėlį", +"Either png or jpg. Ideally square but you will be able to crop it." => "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.", +"Abort" => "Atšaukti", +"Choose as profile image" => "Pasirinkite profilio paveiksliuką", "Language" => "Kalba", "Help translate" => "Padėkite išversti", "WebDAV" => "WebDAV", diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php index 42d83115647..901ef9106e2 100644 --- a/settings/l10n/mk.php +++ b/settings/l10n/mk.php @@ -50,6 +50,7 @@ $TRANSLATIONS = array( "Email" => "Е-пошта", "Your email address" => "Вашата адреса за е-пошта", "Fill in an email address to enable password recovery" => "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката", +"Profile picture" => "Фотографија за профил", "Language" => "Јазик", "Help translate" => "Помогни во преводот", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php index 3d14df3d657..0ba601dd729 100644 --- a/settings/l10n/ms_MY.php +++ b/settings/l10n/ms_MY.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "Alamat emel anda", "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan", +"Profile picture" => "Gambar profil", "Language" => "Bahasa", "Help translate" => "Bantu terjemah", "Create" => "Buat", diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php index e017e965e98..ba46cd654e8 100644 --- a/settings/l10n/nb_NO.php +++ b/settings/l10n/nb_NO.php @@ -87,6 +87,7 @@ $TRANSLATIONS = array( "Email" => "Epost", "Your email address" => "Din e-postadresse", "Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for", +"Profile picture" => "Profilbilde", "Language" => "Språk", "Help translate" => "Bidra til oversettelsen", "WebDAV" => "WebDAV", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 6e82c9c92f6..7b486768b06 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Fout", "Update" => "Bijwerken", "Updated" => "Bijgewerkt", +"Select a profile picture" => "Kies een profielafbeelding", "Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.", "Saving..." => "Opslaan", "deleted" => "verwijderd", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-mailadres", "Your email address" => "Uw e-mailadres", "Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen", +"Profile picture" => "Profielafbeelding", +"Upload new" => "Upload een nieuwe", +"Select new from Files" => "Selecteer een nieuwe vanuit bestanden", +"Remove image" => "Verwijder afbeelding", +"Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden.", +"Abort" => "Afbreken", +"Choose as profile image" => "Kies als profielafbeelding", "Language" => "Taal", "Help translate" => "Help met vertalen", "WebDAV" => "WebDAV", diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php new file mode 100644 index 00000000000..795a80f7d42 --- /dev/null +++ b/settings/l10n/pa.php @@ -0,0 +1,24 @@ + "ਭਾਸ਼ਾ ਬਦਲੀ", +"Disable" => "ਬੰਦ", +"Enable" => "ਚਾਲੂ", +"Please wait...." => "...ਉਡੀਕੋ ਜੀ", +"Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", +"Error" => "ਗਲਤੀ", +"Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ", +"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ", +"deleted" => "ਹਟਾਈ", +"undo" => "ਵਾਪਸ", +"Groups" => "ਗਰੁੱਪ", +"Group Admin" => "ਗਰੁੱਪ ਐਡਮਿਨ", +"Delete" => "ਹਟਾਓ", +"add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ", +"__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__", +"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ", +"Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ", +"Password" => "ਪਾਸਵਰ", +"Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ", +"Username" => "ਯੂਜ਼ਰ-ਨਾਂ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index a8bc60ffed6..d07d1f7a4d2 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -100,6 +100,8 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "Twój adres e-mail", "Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła", +"Profile picture" => "Zdjęcie profilu", +"Abort" => "Anuluj", "Language" => "Język", "Help translate" => "Pomóż w tłumaczeniu", "WebDAV" => "WebDAV", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index 7b51025356b..7d36468e1a5 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "Error" => "Erro", "Update" => "Atualizar", "Updated" => "Atualizado", +"Select a profile picture" => "Selecione uma imagem para o perfil", "Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.", "Saving..." => "Salvando...", "deleted" => "excluído", @@ -100,6 +101,13 @@ $TRANSLATIONS = array( "Email" => "E-mail", "Your email address" => "Seu endereço de e-mail", "Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha", +"Profile picture" => "Imagem para o perfil", +"Upload new" => "Enviar nova foto", +"Select new from Files" => "Selecinar uma nova dos Arquivos", +"Remove image" => "Remover imagem", +"Either png or jpg. Ideally square but you will be able to crop it." => "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.", +"Abort" => "Abortar", +"Choose as profile image" => "Escolha como imagem para o perfil", "Language" => "Idioma", "Help translate" => "Ajude a traduzir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index e1299bb9649..cf0e66a24da 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "O seu endereço de email", "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave", +"Profile picture" => "Foto do perfil", "Language" => "Idioma", "Help translate" => "Ajude a traduzir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 63e502b8d5b..40dbbd45009 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -98,6 +98,7 @@ $TRANSLATIONS = array( "Email" => "E-mail", "Your email address" => "Ваш адрес электронной почты", "Fill in an email address to enable password recovery" => "Введите адрес электронной почты чтобы появилась возможность восстановления пароля", +"Profile picture" => "Фото профиля", "Language" => "Язык", "Help translate" => "Помочь с переводом", "WebDAV" => "WebDAV", diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php index b83407fc3bc..cd44e5f94c5 100644 --- a/settings/l10n/sk_SK.php +++ b/settings/l10n/sk_SK.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "Vaša emailová adresa", "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla", +"Profile picture" => "Profilová fotka", "Language" => "Jazyk", "Help translate" => "Pomôcť s prekladom", "WebDAV" => "WebDAV", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 63477b0b9fe..0fbf3248028 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -87,6 +87,7 @@ $TRANSLATIONS = array( "Email" => "Elektronski naslov", "Your email address" => "Osebni elektronski naslov", "Fill in an email address to enable password recovery" => "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla", +"Profile picture" => "Slika profila", "Language" => "Jezik", "Help translate" => "Sodelujte pri prevajanju", "WebDAV" => "WebDAV", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 15e0ca9b8d5..5f6313f1829 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "E-post", "Your email address" => "Din e-postadress", "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord", +"Profile picture" => "Profilbild", "Language" => "Språk", "Help translate" => "Hjälp att översätta", "WebDAV" => "WebDAV", diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php index ef62f185c5c..90042342559 100644 --- a/settings/l10n/th_TH.php +++ b/settings/l10n/th_TH.php @@ -71,6 +71,7 @@ $TRANSLATIONS = array( "Email" => "อีเมล", "Your email address" => "ที่อยู่อีเมล์ของคุณ", "Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้", +"Profile picture" => "รูปภาพโปรไฟล์", "Language" => "ภาษา", "Help translate" => "ช่วยกันแปล", "WebDAV" => "WebDAV", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index cd90d2f8a01..1f4ce98f555 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "Eposta", "Your email address" => "Eposta adresiniz", "Fill in an email address to enable password recovery" => "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin", +"Profile picture" => "Profil resmi", "Language" => "Dil", "Help translate" => "Çevirilere yardım edin", "WebDAV" => "WebDAV", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index cc14a3648a8..659c5bea1a6 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "电子邮件", "Your email address" => "您的电子邮件", "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能", +"Profile picture" => "联系人图片", "Language" => "语言", "Help translate" => "帮助翻译", "WebDAV" => "WebDAV", diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index 73c015d17af..add2f1fe002 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Email" => "信箱", "Your email address" => "您的電子郵件信箱", "Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼", +"Profile picture" => "個人資料照片", "Language" => "語言", "Help translate" => "幫助翻譯", "WebDAV" => "WebDAV", -- cgit v1.2.3 From 1274d6116dc59a8238ad9d02d467260387fe2eac Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 18 Sep 2013 22:22:51 +0200 Subject: updating php docs --- lib/cache.php | 15 ++++++++++----- lib/cache/broker.php | 8 ++++++++ lib/cache/usercache.php | 4 ++-- lib/public/icache.php | 2 +- tests/lib/cache.php | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/cache.php b/lib/cache.php index a4fa8be710c..a311f10a00f 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -10,17 +10,17 @@ namespace OC; class Cache { /** - * @var OC_Cache $user_cache + * @var Cache $user_cache */ static protected $user_cache; /** - * @var OC_Cache $global_cache + * @var Cache $global_cache */ static protected $global_cache; /** * get the global cache - * @return OC_Cache + * @return Cache */ static public function getGlobalCache() { if (!self::$global_cache) { @@ -31,7 +31,7 @@ class Cache { /** * get the user cache - * @return OC_Cache + * @return Cache */ static public function getUserCache() { if (!self::$user_cache) { @@ -87,7 +87,7 @@ class Cache { /** * clear the user cache of all entries starting with a prefix - * @param string prefix (optional) + * @param string $prefix (optional) * @return bool */ static public function clear($prefix='') { @@ -95,6 +95,11 @@ class Cache { return $user_cache->clear($prefix); } + /** + * creates cache key based on the files given + * @param $files + * @return string + */ static public function generateCacheKeyFromFiles($files) { $key = ''; sort($files); diff --git a/lib/cache/broker.php b/lib/cache/broker.php index b7f1b67a6d3..9b7e837e1bc 100644 --- a/lib/cache/broker.php +++ b/lib/cache/broker.php @@ -9,7 +9,15 @@ namespace OC\Cache; class Broker { + + /** + * @var \OC\Cache + */ protected $fast_cache; + + /** + * @var \OC\Cache + */ protected $slow_cache; public function __construct($fast_cache, $slow_cache) { diff --git a/lib/cache/usercache.php b/lib/cache/usercache.php index aac3b39af33..baa8820700b 100644 --- a/lib/cache/usercache.php +++ b/lib/cache/usercache.php @@ -13,7 +13,7 @@ namespace OC\Cache; class UserCache implements \OCP\ICache { /** - * @var OC\Cache\File $userCache + * @var \OC\Cache\File $userCache */ protected $userCache; @@ -68,7 +68,7 @@ class UserCache implements \OCP\ICache { /** * clear the user cache of all entries starting with a prefix - * @param string prefix (optional) + * @param string $prefix (optional) * @return bool */ public function clear($prefix = '') { diff --git a/lib/public/icache.php b/lib/public/icache.php index 202459f7c24..436ee71b2b9 100644 --- a/lib/public/icache.php +++ b/lib/public/icache.php @@ -48,7 +48,7 @@ interface ICache { /** * clear the user cache of all entries starting with a prefix - * @param string prefix (optional) + * @param string $prefix (optional) * @return bool */ public function clear($prefix = ''); diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 3dcf39f7d60..8fefa25f65d 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -8,7 +8,7 @@ abstract class Test_Cache extends PHPUnit_Framework_TestCase { /** - * @var OC_Cache cache; + * @var \OC\Cache cache; */ protected $instance; -- cgit v1.2.3 From 76f8be3b7aadbb2c78f6c341ef8919973275efc8 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 18 Sep 2013 22:49:09 +0200 Subject: fixing namespaces and rename hasCategory to hasTag --- lib/tags.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 4aafff8e1bb..3320d9ea1a8 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -113,7 +113,7 @@ class Tags implements \OCP\ITags { $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ? AND `type` = ?'; try { - $stmt = OCP\DB::prepare($sql); + $stmt = \OCP\DB::prepare($sql); $result = $stmt->execute(array($this->user, $this->type)); if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); @@ -191,7 +191,7 @@ class Tags implements \OCP\ITags { $stmt = \OCP\DB::prepare($sql); $result = $stmt->execute(array($tagId)); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } } catch(\Exception $e) { @@ -381,7 +381,7 @@ class Tags implements \OCP\ITags { . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), @@ -409,12 +409,12 @@ class Tags implements \OCP\ITags { $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); - if (OCP\DB::isError($result)) { + if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), \OCP\Util::ERROR); } } @@ -435,7 +435,7 @@ class Tags implements \OCP\ITags { $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; $query .= 'AND `type`= ?'; $updates[] = $this->type; - $stmt = OCP\DB::prepare($query); + $stmt = \OCP\DB::prepare($query); $result = $stmt->execute($updates); if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); @@ -471,7 +471,7 @@ class Tags implements \OCP\ITags { * @return boolean */ public function addToFavorites($objid) { - if(!$this->hasCategory(self::TAG_FAVORITE)) { + if(!$this->hasTag(self::TAG_FAVORITE)) { $this->add(self::TAG_FAVORITE, true); } return $this->tagAs($objid, self::TAG_FAVORITE, $this->type); @@ -574,7 +574,7 @@ class Tags implements \OCP\ITags { . '`uid` = ? AND `type` = ? AND `category` = ?'); $result = $stmt->execute(array($this->user, $this->type, $name)); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' -- cgit v1.2.3 From 314ca843e81c2e26e83d58391e313503e0f30ebd Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Thu, 19 Sep 2013 11:27:13 +0200 Subject: Updated method names and added a few more tests. --- lib/public/itags.php | 6 +++--- lib/tags.php | 12 +++++------ tests/lib/tags.php | 59 ++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 57 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/public/itags.php b/lib/public/itags.php index 047d4f5f40b..12643400548 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -65,7 +65,7 @@ interface ITags { * * @returns array */ - public function tags(); + public function getTags(); /** * Get the a list if items tagged with $tag. @@ -75,7 +75,7 @@ interface ITags { * @param string|integer $tag Tag id or name. * @return array An array of object ids or false on error. */ - public function idsForTag($tag); + public function getIdsForTag($tag); /** * Checks whether a tag is already saved. @@ -111,7 +111,7 @@ interface ITags { * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. */ - public function addMulti($names, $sync=false, $id = null); + public function addMultiple($names, $sync=false, $id = null); /** * Delete tag/object relations from the db diff --git a/lib/tags.php b/lib/tags.php index 3320d9ea1a8..2eaa603c1a3 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -96,7 +96,7 @@ class Tags implements \OCP\ITags { } if(count($defaultTags) > 0 && count($this->tags) === 0) { - $this->addMulti($defaultTags, true); + $this->addMultiple($defaultTags, true); } \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true), \OCP\Util::DEBUG); @@ -119,7 +119,7 @@ class Tags implements \OCP\ITags { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } - return ($result->numRows() === 0); + return ((int)$result->numRows() === 0); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR); @@ -138,7 +138,7 @@ class Tags implements \OCP\ITags { * * @return array */ - public function tags() { + public function getTags() { if(!count($this->tags)) { return array(); } @@ -167,7 +167,7 @@ class Tags implements \OCP\ITags { * @param string|integer $tag Tag id or name. * @return array An array of object ids or false on error. */ - public function idsForTag($tag) { + public function getIdsForTag($tag) { $result = null; if(is_numeric($tag)) { $tagId = $tag; @@ -293,7 +293,7 @@ class Tags implements \OCP\ITags { * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. */ - public function addMulti($names, $sync=false, $id = null) { + public function addMultiple($names, $sync=false, $id = null) { if(!is_array($names)) { $names = array($names); } @@ -456,7 +456,7 @@ class Tags implements \OCP\ITags { */ public function getFavorites() { try { - return $this->idsForTag(self::TAG_FAVORITE); + return $this->getIdsForTag(self::TAG_FAVORITE); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), \OCP\Util::ERROR); diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 06baebc0af7..16a03f5645a 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -48,7 +48,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr = new OC\Tags($this->user); $tagMgr->loadTagsFor($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); } public function testAddTags() { @@ -65,7 +65,37 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $this->assertFalse($tagMgr->add('Family')); $this->assertFalse($tagMgr->add('fAMILY')); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); + } + + public function testAddMultiple() { + $tags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($tags as $tag) { + $this->assertFalse($tagMgr->hasTag($tag)); + } + + $result = $tagMgr->addMultiple($tags); + $this->assertTrue((bool)$result); + + foreach($tags as $tag) { + $this->assertTrue($tagMgr->hasTag($tag)); + } + + $this->assertEquals(4, count($tagMgr->getTags())); + } + + public function testIsEmpty() { + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + $this->assertEquals(0, count($tagMgr->getTags())); + $this->assertTrue($tagMgr->isEmpty()); + $tagMgr->add('Tag'); + $this->assertFalse($tagMgr->isEmpty()); } public function testdeleteTags() { @@ -73,13 +103,13 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr = new OC\Tags($this->user); $tagMgr->loadTagsFor($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); $tagMgr->delete('family'); - $this->assertEquals(3, count($tagMgr->tags())); + $this->assertEquals(3, count($tagMgr->getTags())); $tagMgr->delete(array('Friends', 'Work', 'Other')); - $this->assertEquals(0, count($tagMgr->tags())); + $this->assertEquals(0, count($tagMgr->getTags())); } @@ -105,8 +135,8 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr->tagAs($id, 'Family'); } - $this->assertEquals(1, count($tagMgr->tags())); - $this->assertEquals(9, count($tagMgr->idsForTag('Family'))); + $this->assertEquals(1, count($tagMgr->getTags())); + $this->assertEquals(9, count($tagMgr->getIdsForTag('Family'))); } /** @@ -121,13 +151,20 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr->loadTagsFor($this->objectType); foreach($objIds as $id) { - $this->assertTrue(in_array($id, $tagMgr->idsForTag('Family'))); + $this->assertTrue(in_array($id, $tagMgr->getIdsForTag('Family'))); $tagMgr->unTag($id, 'Family'); - $this->assertFalse(in_array($id, $tagMgr->idsForTag('Family'))); + $this->assertFalse(in_array($id, $tagMgr->getIdsForTag('Family'))); } - $this->assertEquals(1, count($tagMgr->tags())); - $this->assertEquals(0, count($tagMgr->idsForTag('Family'))); + $this->assertEquals(1, count($tagMgr->getTags())); + $this->assertEquals(0, count($tagMgr->getIdsForTag('Family'))); + } + + public function testFavorite() { + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + $this->assertTrue($tagMgr->addToFavorites(1)); + $this->assertTrue($tagMgr->removeFromFavorites(1)); } } -- cgit v1.2.3 From 9e4d13858c92e3b42e99152cee7b899a7ddb926b Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Thu, 19 Sep 2013 13:27:41 +0200 Subject: Fix syntax error --- lib/server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 5c386593f1d..4f5bcfbe676 100644 --- a/lib/server.php +++ b/lib/server.php @@ -113,7 +113,6 @@ class Server extends SimpleContainer implements IServerContainer { $folder = $root->get($dir); } return $folder; - } /** @@ -132,6 +131,7 @@ class Server extends SimpleContainer implements IServerContainer { $folder = $root->get($dir); } return $folder; + } /** * Returns an ICache instance -- cgit v1.2.3 From 445d34a2a90295c11ace24171c20a93991ebfa87 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sun, 3 Mar 2013 12:04:29 +0100 Subject: Convert OC_Preference to object interface --- lib/legacy/preferences.php | 137 ++++++++++++++++++++++++++++++++++ lib/preferences.php | 153 ++++++++++++++++++++------------------ tests/lib/preferences.php | 179 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 397 insertions(+), 72 deletions(-) create mode 100644 lib/legacy/preferences.php (limited to 'lib') diff --git a/lib/legacy/preferences.php b/lib/legacy/preferences.php new file mode 100644 index 00000000000..8bfac849a4a --- /dev/null +++ b/lib/legacy/preferences.php @@ -0,0 +1,137 @@ +. + * + */ + +/** + * This class provides an easy way for storing user preferences. + */ +OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection()); +class OC_Preferences{ + public static $object; + /** + * @brief Get all users using the preferences + * @return array with user ids + * + * This function returns a list of all users that have at least one entry + * in the preferences table. + */ + public static function getUsers() { + return self::$object->getUsers(); + } + + /** + * @brief Get all apps of a user + * @param string $user user + * @return array with app ids + * + * This function returns a list of all apps of the user that have at least + * one entry in the preferences table. + */ + public static function getApps( $user ) { + return self::$object->getApps( $user ); + } + + /** + * @brief Get the available keys for an app + * @param string $user user + * @param string $app the app we are looking for + * @return array with key names + * + * This function gets all keys of an app of an user. Please note that the + * values are not returned. + */ + public static function getKeys( $user, $app ) { + return self::$object->getKeys( $user, $app ); + } + + /** + * @brief Gets the preference + * @param string $user user + * @param string $app app + * @param string $key key + * @param string $default = null, default value if the key does not exist + * @return string the value or $default + * + * This function gets a value from the preferences table. If the key does + * not exist the default value will be returned + */ + public static function getValue( $user, $app, $key, $default = null ) { + return self::$object->getValue( $user, $app, $key, $default ); + } + + /** + * @brief sets a value in the preferences + * @param string $user user + * @param string $app app + * @param string $key key + * @param string $value value + * + * Adds a value to the preferences. If the key did not exist before, it + * will be added automagically. + */ + public static function setValue( $user, $app, $key, $value ) { + self::$object->setValue( $user, $app, $key, $value ); + } + + /** + * @brief Deletes a key + * @param string $user user + * @param string $app app + * @param string $key key + * + * Deletes a key. + */ + public function deleteKey( $user, $app, $key ) { + self::$object->deleteKey( $user, $app, $key ); + } + + /** + * @brief Remove app of user from preferences + * @param string $user user + * @param string $app app + * + * Removes all keys in preferences belonging to the app and the user. + */ + public static function deleteApp( $user, $app ) { + self::$object->deleteApp( $user, $app ); + } + + /** + * @brief Remove user from preferences + * @param string $user user + * + * Removes all keys in preferences belonging to the user. + */ + public static function deleteUser( $user ) { + self::$object->deleteUser( $user ); + } + + /** + * @brief Remove app from all users + * @param string $app app + * + * Removes all keys in preferences belonging to the app. + */ + public static function deleteAppFromAllUsers( $app ) { + self::$object->deleteAppFromAllUsers( $app ); + } +} diff --git a/lib/preferences.php b/lib/preferences.php index 11ca760830e..359d9a83589 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -34,10 +34,21 @@ * */ +namespace OC; + +use \OC\DB\Connection; + + /** * This class provides an easy way for storing user preferences. */ -class OC_Preferences{ +class Preferences { + protected $conn; + + public function __construct(Connection $conn) { + $this->conn = $conn; + } + /** * @brief Get all users using the preferences * @return array with user ids @@ -45,14 +56,13 @@ class OC_Preferences{ * This function returns a list of all users that have at least one entry * in the preferences table. */ - public static function getUsers() { - // No need for more comments - $query = OC_DB::prepare( 'SELECT DISTINCT( `userid` ) FROM `*PREFIX*preferences`' ); - $result = $query->execute(); + public function getUsers() { + $query = 'SELECT DISTINCT `userid` FROM `*PREFIX*preferences`'; + $result = $this->conn->executeQuery( $query ); $users = array(); - while( $row = $result->fetchRow()) { - $users[] = $row["userid"]; + while( $userid = $result->fetchColumn()) { + $users[] = $userid; } return $users; @@ -66,14 +76,13 @@ class OC_Preferences{ * This function returns a list of all apps of the user that have at least * one entry in the preferences table. */ - public static function getApps( $user ) { - // No need for more comments - $query = OC_DB::prepare( 'SELECT DISTINCT( `appid` ) FROM `*PREFIX*preferences` WHERE `userid` = ?' ); - $result = $query->execute( array( $user )); + public function getApps( $user ) { + $query = 'SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'; + $result = $this->conn->executeQuery( $query, array( $user ) ); $apps = array(); - while( $row = $result->fetchRow()) { - $apps[] = $row["appid"]; + while( $appid = $result->fetchColumn()) { + $apps[] = $appid; } return $apps; @@ -88,14 +97,13 @@ class OC_Preferences{ * This function gets all keys of an app of an user. Please note that the * values are not returned. */ - public static function getKeys( $user, $app ) { - // No need for more comments - $query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' ); - $result = $query->execute( array( $user, $app )); + public function getKeys( $user, $app ) { + $query = 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'; + $result = $this->conn->executeQuery( $query, array( $user, $app )); $keys = array(); - while( $row = $result->fetchRow()) { - $keys[] = $row["configkey"]; + while( $key = $result->fetchColumn()) { + $keys[] = $key; } return $keys; @@ -112,16 +120,14 @@ class OC_Preferences{ * This function gets a value from the preferences table. If the key does * not exist the default value will be returned */ - public static function getValue( $user, $app, $key, $default = null ) { + public function getValue( $user, $app, $key, $default = null ) { // Try to fetch the value, return default if not exists. - $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $result = $query->execute( array( $user, $app, $key )); - - $row = $result->fetchRow(); + $query = 'SELECT `configvalue` FROM `*PREFIX*preferences`' + .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'; + $row = $this->conn->fetchAssoc( $query, array( $user, $app, $key )); if($row) { return $row["configvalue"]; - }else{ + } else { return $default; } } @@ -132,29 +138,36 @@ class OC_Preferences{ * @param string $app app * @param string $key key * @param string $value value - * @return bool * * Adds a value to the preferences. If the key did not exist before, it * will be added automagically. */ - public static function setValue( $user, $app, $key, $value ) { + public function setValue( $user, $app, $key, $value ) { // Check if the key does exist - $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $values=$query->execute(array($user, $app, $key))->fetchAll(); - $exists=(count($values)>0); + $query = 'SELECT COUNT(*) FROM `*PREFIX*preferences`' + .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'; + $count = $this->conn->fetchColumn( $query, array( $user, $app, $key )); + $exists = $count > 0; if( !$exists ) { - $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*preferences`' - .' ( `userid`, `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ?, ? )' ); - $query->execute( array( $user, $app, $key, $value )); + $data = array( + 'userid' => $user, + 'appid' => $app, + 'configkey' => $key, + 'configvalue' => $value, + ); + $this->conn->insert('*PREFIX*preferences', $data); + } else { + $data = array( + 'configvalue' => $value, + ); + $where = array( + 'userid' => $user, + 'appid' => $app, + 'configkey' => $key, + ); + $this->conn->update('*PREFIX*preferences', $data, $where); } - else{ - $query = OC_DB::prepare( 'UPDATE `*PREFIX*preferences` SET `configvalue` = ?' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $query->execute( array( $value, $user, $app, $key )); - } - return true; } /** @@ -162,62 +175,58 @@ class OC_Preferences{ * @param string $user user * @param string $app app * @param string $key key - * @return bool * * Deletes a key. */ - public static function deleteKey( $user, $app, $key ) { - // No need for more comments - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $query->execute( array( $user, $app, $key )); - - return true; + public function deleteKey( $user, $app, $key ) { + $where = array( + 'userid' => $user, + 'appid' => $app, + 'configkey' => $key, + ); + $this->conn->delete('*PREFIX*preferences', $where); } /** * @brief Remove app of user from preferences * @param string $user user * @param string $app app - * @return bool * - * Removes all keys in appconfig belonging to the app and the user. + * Removes all keys in preferences belonging to the app and the user. */ - public static function deleteApp( $user, $app ) { - // No need for more comments - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' ); - $query->execute( array( $user, $app )); - - return true; + public function deleteApp( $user, $app ) { + $where = array( + 'userid' => $user, + 'appid' => $app, + ); + $this->conn->delete('*PREFIX*preferences', $where); } /** * @brief Remove user from preferences * @param string $user user - * @return bool * - * Removes all keys in appconfig belonging to the user. + * Removes all keys in preferences belonging to the user. */ - public static function deleteUser( $user ) { - // No need for more comments - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?' ); - $query->execute( array( $user )); - - return true; + public function deleteUser( $user ) { + $where = array( + 'userid' => $user, + ); + $this->conn->delete('*PREFIX*preferences', $where); } /** * @brief Remove app from all users * @param string $app app - * @return bool * * Removes all keys in preferences belonging to the app. */ - public static function deleteAppFromAllUsers( $app ) { - // No need for more comments - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid` = ?' ); - $query->execute( array( $app )); - - return true; + public function deleteAppFromAllUsers( $app ) { + $where = array( + 'appid' => $app, + ); + $this->conn->delete('*PREFIX*preferences', $where); } } + +require_once __DIR__.'/legacy/'.basename(__FILE__); diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php index 612cc81926b..68b794e9ea9 100644 --- a/tests/lib/preferences.php +++ b/tests/lib/preferences.php @@ -1,6 +1,7 @@ + * Copyright (c) 2013 Bart Visscher * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. @@ -124,3 +125,181 @@ class Test_Preferences extends PHPUnit_Framework_TestCase { $this->assertEquals(0, $result->numRows()); } } + +class Test_Preferences_Object extends PHPUnit_Framework_TestCase { + public function testGetUsers() + { + $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); + $statementMock->expects($this->exactly(2)) + ->method('fetchColumn') + ->will($this->onConsecutiveCalls('foo', false)); + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('executeQuery') + ->with($this->equalTo('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`')) + ->will($this->returnValue($statementMock)); + + $preferences = new OC\Preferences($connectionMock); + $apps = $preferences->getUsers(); + $this->assertEquals(array('foo'), $apps); + } + + public function testGetApps() + { + $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); + $statementMock->expects($this->exactly(2)) + ->method('fetchColumn') + ->will($this->onConsecutiveCalls('foo', false)); + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('executeQuery') + ->with($this->equalTo('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'), + $this->equalTo(array('bar'))) + ->will($this->returnValue($statementMock)); + + $preferences = new OC\Preferences($connectionMock); + $apps = $preferences->getApps('bar'); + $this->assertEquals(array('foo'), $apps); + } + + public function testGetKeys() + { + $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); + $statementMock->expects($this->exactly(2)) + ->method('fetchColumn') + ->will($this->onConsecutiveCalls('foo', false)); + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('executeQuery') + ->with($this->equalTo('SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'), + $this->equalTo(array('bar', 'moo'))) + ->will($this->returnValue($statementMock)); + + $preferences = new OC\Preferences($connectionMock); + $keys = $preferences->getKeys('bar', 'moo'); + $this->assertEquals(array('foo'), $keys); + } + + public function testGetValue() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->exactly(2)) + ->method('fetchAssoc') + ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'), + $this->equalTo(array('grg', 'bar', 'red'))) + ->will($this->onConsecutiveCalls(array('configvalue'=>'foo'), null)); + + $preferences = new OC\Preferences($connectionMock); + $value = $preferences->getValue('grg', 'bar', 'red'); + $this->assertEquals('foo', $value); + $value = $preferences->getValue('grg', 'bar', 'red', 'def'); + $this->assertEquals('def', $value); + } + + public function testSetValue() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->exactly(2)) + ->method('fetchColumn') + ->with($this->equalTo('SELECT COUNT(*) FROM `*PREFIX*preferences`' + .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'), + $this->equalTo(array('grg', 'bar', 'foo'))) + ->will($this->onConsecutiveCalls(0, 1)); + $connectionMock->expects($this->once()) + ->method('insert') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'userid' => 'grg', + 'appid' => 'bar', + 'configkey' => 'foo', + 'configvalue' => 'v1', + ) + )); + $connectionMock->expects($this->once()) + ->method('update') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'configvalue' => 'v2', + )), + $this->equalTo( + array( + 'userid' => 'grg', + 'appid' => 'bar', + 'configkey' => 'foo', + ) + )); + + $preferences = new OC\Preferences($connectionMock); + $preferences->setValue('grg', 'bar', 'foo', 'v1'); + $preferences->setValue('grg', 'bar', 'foo', 'v2'); + } + + public function testDeleteKey() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('delete') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'userid' => 'grg', + 'appid' => 'bar', + 'configkey' => 'foo', + ) + )); + + $preferences = new OC\Preferences($connectionMock); + $preferences->deleteKey('grg', 'bar', 'foo'); + } + + public function testDeleteApp() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('delete') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'userid' => 'grg', + 'appid' => 'bar', + ) + )); + + $preferences = new OC\Preferences($connectionMock); + $preferences->deleteApp('grg', 'bar'); + } + + public function testDeleteUser() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('delete') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'userid' => 'grg', + ) + )); + + $preferences = new OC\Preferences($connectionMock); + $preferences->deleteUser('grg'); + } + + public function testDeleteAppFromAllUsers() + { + $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); + $connectionMock->expects($this->once()) + ->method('delete') + ->with($this->equalTo('*PREFIX*preferences'), + $this->equalTo( + array( + 'appid' => 'bar', + ) + )); + + $preferences = new OC\Preferences($connectionMock); + $preferences->deleteAppFromAllUsers('bar'); + } +} -- cgit v1.2.3 From 395cc737a17fb2bd22f38b7cccf4ba1efd32cafd Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sat, 31 Aug 2013 15:50:47 +0200 Subject: Add missing static --- lib/legacy/preferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/legacy/preferences.php b/lib/legacy/preferences.php index 8bfac849a4a..7b4cfca96bc 100644 --- a/lib/legacy/preferences.php +++ b/lib/legacy/preferences.php @@ -100,7 +100,7 @@ class OC_Preferences{ * * Deletes a key. */ - public function deleteKey( $user, $app, $key ) { + public static function deleteKey( $user, $app, $key ) { self::$object->deleteKey( $user, $app, $key ); } -- cgit v1.2.3 From f6284bdce735651a572474d97930239bd2315d52 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sat, 31 Aug 2013 15:52:11 +0200 Subject: Add missing return true statements to legacy preferences functions --- lib/legacy/preferences.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/legacy/preferences.php b/lib/legacy/preferences.php index 7b4cfca96bc..a663db7598b 100644 --- a/lib/legacy/preferences.php +++ b/lib/legacy/preferences.php @@ -84,12 +84,14 @@ class OC_Preferences{ * @param string $app app * @param string $key key * @param string $value value + * @return bool * * Adds a value to the preferences. If the key did not exist before, it * will be added automagically. */ public static function setValue( $user, $app, $key, $value ) { self::$object->setValue( $user, $app, $key, $value ); + return true; } /** @@ -102,36 +104,43 @@ class OC_Preferences{ */ public static function deleteKey( $user, $app, $key ) { self::$object->deleteKey( $user, $app, $key ); + return true; } /** * @brief Remove app of user from preferences * @param string $user user * @param string $app app + * @return bool * * Removes all keys in preferences belonging to the app and the user. */ public static function deleteApp( $user, $app ) { self::$object->deleteApp( $user, $app ); + return true; } /** * @brief Remove user from preferences * @param string $user user + * @return bool * * Removes all keys in preferences belonging to the user. */ public static function deleteUser( $user ) { self::$object->deleteUser( $user ); + return true; } /** * @brief Remove app from all users * @param string $app app + * @return bool * * Removes all keys in preferences belonging to the app. */ public static function deleteAppFromAllUsers( $app ) { self::$object->deleteAppFromAllUsers( $app ); + return true; } } -- cgit v1.2.3 From 55efe1e56ced021ae99d7af6d6331882fd8244ba Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sun, 1 Sep 2013 12:35:20 +0200 Subject: Fix insert/update/delete helper functions for oracle --- lib/db.php | 6 +++++- lib/db/oracleconnection.php | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 lib/db/oracleconnection.php (limited to 'lib') diff --git a/lib/db.php b/lib/db.php index b9505b88d82..1e5d12649df 100644 --- a/lib/db.php +++ b/lib/db.php @@ -87,6 +87,7 @@ class OC_DB { 'driver' => 'pdo_sqlite', ); $connectionParams['adapter'] = '\OC\DB\AdapterSqlite'; + $connectionParams['wrapperClass'] = 'OC\DB\Connection'; break; case 'mysql': $connectionParams = array( @@ -99,6 +100,7 @@ class OC_DB { 'driver' => 'pdo_mysql', ); $connectionParams['adapter'] = '\OC\DB\Adapter'; + $connectionParams['wrapperClass'] = 'OC\DB\Connection'; break; case 'pgsql': $connectionParams = array( @@ -110,6 +112,7 @@ class OC_DB { 'driver' => 'pdo_pgsql', ); $connectionParams['adapter'] = '\OC\DB\AdapterPgSql'; + $connectionParams['wrapperClass'] = 'OC\DB\Connection'; break; case 'oci': $connectionParams = array( @@ -124,6 +127,7 @@ class OC_DB { $connectionParams['port'] = $port; } $connectionParams['adapter'] = '\OC\DB\AdapterOCI8'; + $connectionParams['wrapperClass'] = 'OC\DB\OracleConnection'; $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit); break; case 'mssql': @@ -137,11 +141,11 @@ class OC_DB { 'driver' => 'pdo_sqlsrv', ); $connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv'; + $connectionParams['wrapperClass'] = 'OC\DB\Connection'; break; default: return false; } - $connectionParams['wrapperClass'] = 'OC\DB\Connection'; $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' ); try { self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager); diff --git a/lib/db/oracleconnection.php b/lib/db/oracleconnection.php new file mode 100644 index 00000000000..3da3d91dbfa --- /dev/null +++ b/lib/db/oracleconnection.php @@ -0,0 +1,50 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\DB; + +class OracleConnection extends Connection { + /** + * Quote the keys of the array + */ + private function quoteKeys(array $data) { + $return = array(); + foreach($data as $key => $value) { + $return[$this->quoteIdentifier($key)] = $value; + } + return $return; + } + + /* + * (inherit docs) + */ + public function insert($tableName, array $data, array $types = array()) { + $tableName = $this->quoteIdentifier($tableName); + $data = $this->quoteKeys($data); + return parent::insert($tableName, $data, $types); + } + + /* + * (inherit docs) + */ + public function update($tableName, array $data, array $identifier, array $types = array()) { + $tableName = $this->quoteIdentifier($tableName); + $data = $this->quoteKeys($data); + $identifier = $this->quoteKeys($identifier); + return parent::update($tableName, $data, $identifier, $types); + } + + /* + * (inherit docs) + */ + public function delete($tableName, array $identifier) { + $tableName = $this->quoteIdentifier($tableName); + $identifier = $this->quoteKeys($identifier); + return parent::delete($tableName, $identifier); + } +} -- cgit v1.2.3 From 0a2a4cb12ec620fc6807e990223ba0648d43da77 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 18 Sep 2013 16:38:59 +0200 Subject: update inherit docs comment --- lib/db/oracleconnection.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/db/oracleconnection.php b/lib/db/oracleconnection.php index 3da3d91dbfa..e2fc4644f47 100644 --- a/lib/db/oracleconnection.php +++ b/lib/db/oracleconnection.php @@ -21,7 +21,7 @@ class OracleConnection extends Connection { } /* - * (inherit docs) + * {@inheritDoc} */ public function insert($tableName, array $data, array $types = array()) { $tableName = $this->quoteIdentifier($tableName); @@ -30,7 +30,7 @@ class OracleConnection extends Connection { } /* - * (inherit docs) + * {@inheritDoc} */ public function update($tableName, array $data, array $identifier, array $types = array()) { $tableName = $this->quoteIdentifier($tableName); @@ -40,7 +40,7 @@ class OracleConnection extends Connection { } /* - * (inherit docs) + * {@inheritDoc} */ public function delete($tableName, array $identifier) { $tableName = $this->quoteIdentifier($tableName); -- cgit v1.2.3 From e8bf576184fdafbe74f3394dc253a56c07be6507 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 26 Jul 2013 14:11:59 +0200 Subject: add initial search in shared files --- apps/files_sharing/lib/cache.php | 26 +++++++++++++++++++++++++- lib/public/share.php | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 33cd1428899..28e3cbdb2e1 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -226,7 +226,31 @@ class Shared_Cache extends Cache { * @return array of file data */ public function search($pattern) { - // TODO + + // normalize pattern + $pattern = $this->normalize($pattern); + + $ids = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL); + foreach ($ids as $file) { + $folderBackend = \OCP\Share::getBackend('folder'); + $children = $folderBackend->getChildren($file); + foreach ($children as $child) { + $ids[] = (int)$child['source']; + } + + } + $placeholders = join(',', array_fill(0, count($ids), '?')); + + $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag` + FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `fileid` IN (' . $placeholders . ')'; + $result = \OC_DB::executeAudited($sql, array_merge(array($pattern), $ids)); + $files = array(); + while ($row = $result->fetchRow()) { + $row['mimetype'] = $this->getMimetype($row['mimetype']); + $row['mimepart'] = $this->getMimetype($row['mimepart']); + $files[] = $row; + } + return $files; } /** diff --git a/lib/public/share.php b/lib/public/share.php index 9ab956d84b9..10922965ea8 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -748,7 +748,7 @@ class Share { * @param string Item type * @return Sharing backend object */ - private static function getBackend($itemType) { + public static function getBackend($itemType) { if (isset(self::$backends[$itemType])) { return self::$backends[$itemType]; } else if (isset(self::$backendTypes[$itemType]['class'])) { -- cgit v1.2.3 From 944e9b8c69c4b78f7afbc6153d35cd50da060b09 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 20 Sep 2013 12:40:21 +0200 Subject: make sure that both $permissions and $oldPermissions have the same type --- lib/public/share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 91c5c477c8d..91b0ef6dc69 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -463,7 +463,7 @@ class Share { } else { // reuse the already set password, but only if we change permissions // otherwise the user disabled the password protection - if ($checkExists && (int)$permissions !== $oldPermissions) { + if ($checkExists && (int)$permissions !== (int)$oldPermissions) { $shareWith = $checkExists['share_with']; } } -- cgit v1.2.3 From ac73ce1b2a9cbcafce29d9f6be768b0629f68ddb Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 12:45:56 +0200 Subject: Add UserSession to server container --- lib/public/iservercontainer.php | 7 ++++++ lib/public/iusersession.php | 30 ++++++++++++++++++++++ lib/server.php | 55 +++++++++++++++++++++++++++++++++++++++++ lib/user.php | 43 ++------------------------------ 4 files changed, 94 insertions(+), 41 deletions(-) create mode 100644 lib/public/iusersession.php (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 1725b7c74e0..ad714276660 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -62,6 +62,13 @@ interface IServerContainer { */ function getRootFolder(); + /** + * Returns the user session + * + * @return \OCP\IUserSession + */ + function getUserSession(); + /** * Returns an ICache instance * diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php new file mode 100644 index 00000000000..5dc1ecf71e6 --- /dev/null +++ b/lib/public/iusersession.php @@ -0,0 +1,30 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ + +namespace OCP; + +/** + * User session + */ +interface IUserSession { + /** + * Do a user login + * @param string $user the username + * @param string $password the password + * @return bool true if successful + */ + public function login($user, $password); + + /** + * @brief Logs the user out including all the session data + * Logout, destroys session + */ + public function logout(); + +} diff --git a/lib/server.php b/lib/server.php index f4dc22a2be4..316ed39665b 100644 --- a/lib/server.php +++ b/lib/server.php @@ -56,6 +56,47 @@ class Server extends SimpleContainer implements IServerContainer { $view = new View(); return new Root($manager, $view, $user); }); + $this->registerService('UserManager', function($c) { + return new \OC\User\Manager(); + }); + $this->registerService('UserSession', function($c) { + $manager = $c->query('UserManager'); + $userSession = new \OC\User\Session($manager, \OC::$session); + $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { + \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password)); + }); + $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password)); + }); + $userSession->listen('\OC\User', 'preDelete', function ($user) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID())); + }); + $userSession->listen('\OC\User', 'postDelete', function ($user) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID())); + }); + $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); + }); + $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); + }); + $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { + \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password)); + }); + $userSession->listen('\OC\User', 'postLogin', function ($user, $password) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); + }); + $userSession->listen('\OC\User', 'logout', function () { + \OC_Hook::emit('OC_User', 'logout', array()); + }); + return $userSession; + }); $this->registerService('UserCache', function($c) { return new UserCache(); }); @@ -97,6 +138,20 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('RootFolder'); } + /** + * @return \OC\User\Manager + */ + function getUserManager() { + return $this->query('UserManager'); + } + + /** + * @return \OC\User\Session + */ + function getUserSession() { + return $this->query('UserSession'); + } + /** * Returns an ICache instance * diff --git a/lib/user.php b/lib/user.php index 0f6f40aec9a..7f6a296c3ea 100644 --- a/lib/user.php +++ b/lib/user.php @@ -37,54 +37,15 @@ * logout() */ class OC_User { - public static $userSession = null; - public static function getUserSession() { - if (!self::$userSession) { - $manager = new \OC\User\Manager(); - self::$userSession = new \OC\User\Session($manager, \OC::$session); - self::$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { - \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password)); - }); - self::$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password)); - }); - self::$userSession->listen('\OC\User', 'preDelete', function ($user) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID())); - }); - self::$userSession->listen('\OC\User', 'postDelete', function ($user) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID())); - }); - self::$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { - /** @var $user \OC\User\User */ - OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); - }); - self::$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { - /** @var $user \OC\User\User */ - OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); - }); - self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { - \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password)); - }); - self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); - }); - self::$userSession->listen('\OC\User', 'logout', function () { - \OC_Hook::emit('OC_User', 'logout', array()); - }); - } - return self::$userSession; + return OC::$server->getUserSession(); } /** * @return \OC\User\Manager */ public static function getManager() { - return self::getUserSession()->getManager(); + return OC::$server->getUserManager(); } private static $_backends = array(); -- cgit v1.2.3 From aa8a85f77d0c6705ee727d182e95d288ba7b7917 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 14:33:45 +0200 Subject: Add DBConnection to server container --- lib/db/connection.php | 2 +- lib/public/idbconnection.php | 71 +++++++++++++++++++++++++++++++++++++++++ lib/public/iservercontainer.php | 7 ++++ lib/server.php | 8 +++++ 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 lib/public/idbconnection.php (limited to 'lib') diff --git a/lib/db/connection.php b/lib/db/connection.php index 2581969dbd0..2d3193a148a 100644 --- a/lib/db/connection.php +++ b/lib/db/connection.php @@ -12,7 +12,7 @@ use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Cache\QueryCacheProfile; use Doctrine\Common\EventManager; -class Connection extends \Doctrine\DBAL\Connection { +class Connection extends \Doctrine\DBAL\Connection implements \OCP\IDBConnection { /** * @var string $tablePrefix */ diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php new file mode 100644 index 00000000000..67dd7ccfc37 --- /dev/null +++ b/lib/public/idbconnection.php @@ -0,0 +1,71 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ + +namespace OCP; + +/** + * TODO: Description + */ +interface IDBConnection { + /** + * Used to abstract the owncloud database access away + * @param string $sql the sql query with ? placeholder for params + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \Doctrine\DBAL\Driver\Statement The prepared statement. + */ + public function prepare($sql, $limit=null, $offset=null); + + /** + * Used to get the id of the just inserted element + * @param string $tableName the name of the table where we inserted the item + * @return int the id of the inserted element + */ + public function lastInsertId($table = null); + + /** + * @brief Insert a row if a matching row doesn't exists. + * @param $table string The table name (will replace *PREFIX*) to perform the replace on. + * @param $input array + * + * The input array if in the form: + * + * array ( 'id' => array ( 'value' => 6, + * 'key' => true + * ), + * 'name' => array ('value' => 'Stoyan'), + * 'family' => array ('value' => 'Stefanov'), + * 'birth_date' => array ('value' => '1975-06-20') + * ); + * @return bool + * + */ + public function insertIfNotExist($table, $input); + + /** + * @brief Start a transaction + */ + public function beginTransaction(); + + /** + * @brief Commit the database changes done during a transaction that is in progress + */ + public function commit(); + + /** + * @brief Rollback the database changes done during a transaction that is in progress + */ + public function rollBack(); + + /** + * returns the error code and message as a string for logging + * @return string + */ + public function getError(); +} diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index ad714276660..5481cd6ce6a 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -83,4 +83,11 @@ interface IServerContainer { */ function getSession(); + /** + * Returns the current session + * + * @return \OCP\IDBConnection + */ + function getDatabaseConnection(); + } diff --git a/lib/server.php b/lib/server.php index 316ed39665b..a5288fa1482 100644 --- a/lib/server.php +++ b/lib/server.php @@ -170,4 +170,12 @@ class Server extends SimpleContainer implements IServerContainer { return \OC::$session; } + /** + * Returns the current session + * + * @return \OCP\IDBConnection + */ + function getDatabaseConnection() { + return \OC_DB::getConnection(); + } } -- cgit v1.2.3 From 5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 20 Sep 2013 10:50:14 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ar.php | 3 - apps/files/l10n/bg_BG.php | 1 - apps/files/l10n/bn_BD.php | 1 - apps/files/l10n/ca.php | 3 - apps/files/l10n/cs_CZ.php | 3 - apps/files/l10n/cy_GB.php | 3 - apps/files/l10n/da.php | 3 - apps/files/l10n/de.php | 3 - apps/files/l10n/de_CH.php | 3 - apps/files/l10n/de_DE.php | 3 - apps/files/l10n/el.php | 3 - apps/files/l10n/en_GB.php | 3 - apps/files/l10n/eo.php | 3 - apps/files/l10n/es.php | 3 - apps/files/l10n/es_AR.php | 3 - apps/files/l10n/et_EE.php | 3 - apps/files/l10n/eu.php | 3 - apps/files/l10n/fa.php | 3 - apps/files/l10n/fi_FI.php | 2 - apps/files/l10n/fr.php | 3 - apps/files/l10n/gl.php | 3 - apps/files/l10n/he.php | 3 - apps/files/l10n/hr.php | 2 - apps/files/l10n/hu_HU.php | 3 - apps/files/l10n/id.php | 2 - apps/files/l10n/is.php | 1 - apps/files/l10n/it.php | 3 - apps/files/l10n/ja_JP.php | 3 - apps/files/l10n/ka_GE.php | 3 - apps/files/l10n/ko.php | 3 - apps/files/l10n/lb.php | 1 - apps/files/l10n/lt_LT.php | 3 - apps/files/l10n/lv.php | 3 - apps/files/l10n/mk.php | 1 - apps/files/l10n/ms_MY.php | 1 - apps/files/l10n/nb_NO.php | 3 - apps/files/l10n/nl.php | 3 - apps/files/l10n/nn_NO.php | 3 - apps/files/l10n/oc.php | 2 - apps/files/l10n/pa.php | 1 - apps/files/l10n/pl.php | 3 - apps/files/l10n/pt_BR.php | 3 - apps/files/l10n/pt_PT.php | 3 - apps/files/l10n/ro.php | 3 - apps/files/l10n/ru.php | 5 +- apps/files/l10n/si_LK.php | 1 - apps/files/l10n/sk_SK.php | 3 - apps/files/l10n/sl.php | 3 - apps/files/l10n/sq.php | 3 - apps/files/l10n/sr.php | 3 - apps/files/l10n/sr@latin.php | 3 + apps/files/l10n/sv.php | 3 - apps/files/l10n/ta_LK.php | 2 - apps/files/l10n/th_TH.php | 3 - apps/files/l10n/tr.php | 3 - apps/files/l10n/ug.php | 1 - apps/files/l10n/uk.php | 3 - apps/files/l10n/vi.php | 3 - apps/files/l10n/zh_CN.php | 3 - apps/files/l10n/zh_TW.php | 3 - apps/files_trashbin/l10n/en_GB.php | 4 +- apps/files_trashbin/l10n/sr@latin.php | 1 + apps/user_ldap/l10n/ru.php | 3 + apps/user_ldap/l10n/sr@latin.php | 1 + core/l10n/ach.php | 3 +- core/l10n/af_ZA.php | 1 + core/l10n/ar.php | 1 + core/l10n/be.php | 1 + core/l10n/bg_BG.php | 1 + core/l10n/bn_BD.php | 1 + core/l10n/bs.php | 1 + core/l10n/ca.php | 1 + core/l10n/cs_CZ.php | 1 + core/l10n/cy_GB.php | 1 + core/l10n/da.php | 1 + core/l10n/de.php | 1 + core/l10n/de_AT.php | 3 +- core/l10n/de_CH.php | 1 + core/l10n/de_DE.php | 1 + core/l10n/el.php | 1 + core/l10n/en@pirate.php | 1 + core/l10n/en_GB.php | 3 +- core/l10n/eo.php | 1 + core/l10n/es.php | 1 + core/l10n/es_AR.php | 1 + core/l10n/es_MX.php | 3 +- core/l10n/et_EE.php | 1 + core/l10n/eu.php | 1 + core/l10n/fa.php | 1 + core/l10n/fi_FI.php | 1 + core/l10n/fr.php | 6 + core/l10n/gl.php | 1 + core/l10n/he.php | 1 + core/l10n/hi.php | 1 + core/l10n/hr.php | 1 + core/l10n/hu_HU.php | 1 + core/l10n/hy.php | 3 +- core/l10n/ia.php | 1 + core/l10n/id.php | 1 + core/l10n/is.php | 1 + core/l10n/it.php | 7 +- core/l10n/ja_JP.php | 1 + core/l10n/ka.php | 1 + core/l10n/ka_GE.php | 1 + core/l10n/km.php | 3 +- core/l10n/kn.php | 3 +- core/l10n/ko.php | 1 + core/l10n/ku_IQ.php | 1 + core/l10n/lb.php | 1 + core/l10n/lt_LT.php | 1 + core/l10n/lv.php | 1 + core/l10n/mk.php | 1 + core/l10n/ml_IN.php | 3 +- core/l10n/ms_MY.php | 1 + core/l10n/my_MM.php | 1 + core/l10n/nb_NO.php | 1 + core/l10n/ne.php | 3 +- core/l10n/nl.php | 1 + core/l10n/nn_NO.php | 1 + core/l10n/nqo.php | 3 +- core/l10n/oc.php | 1 + core/l10n/pa.php | 1 + core/l10n/pl.php | 1 + core/l10n/pt_BR.php | 1 + core/l10n/pt_PT.php | 6 + core/l10n/ro.php | 1 + core/l10n/ru.php | 10 +- core/l10n/si_LK.php | 1 + core/l10n/sk.php | 3 +- core/l10n/sk_SK.php | 1 + core/l10n/sl.php | 1 + core/l10n/sq.php | 1 + core/l10n/sr.php | 1 + core/l10n/sr@latin.php | 70 +++++++++++- core/l10n/sv.php | 1 + core/l10n/sw_KE.php | 3 +- core/l10n/ta_LK.php | 1 + core/l10n/te.php | 1 + core/l10n/th_TH.php | 1 + core/l10n/tr.php | 1 + core/l10n/ug.php | 1 + core/l10n/uk.php | 1 + core/l10n/ur_PK.php | 1 + core/l10n/vi.php | 1 + core/l10n/zh_CN.php | 1 + core/l10n/zh_HK.php | 1 + core/l10n/zh_TW.php | 1 + l10n/ach/core.po | 66 ++++++++--- l10n/ach/files.po | 122 ++++++++++---------- l10n/ach/settings.po | 10 +- l10n/af_ZA/core.po | 66 ++++++++--- l10n/af_ZA/files.po | 122 ++++++++++---------- l10n/af_ZA/settings.po | 10 +- l10n/ar/core.po | 70 +++++++++--- l10n/ar/files.po | 128 +++++++++++---------- l10n/ar/settings.po | 10 +- l10n/be/core.po | 68 +++++++++--- l10n/be/files.po | 122 ++++++++++---------- l10n/be/settings.po | 10 +- l10n/bg_BG/core.po | 66 ++++++++--- l10n/bg_BG/files.po | 124 +++++++++++---------- l10n/bg_BG/settings.po | 10 +- l10n/bn_BD/core.po | 66 ++++++++--- l10n/bn_BD/files.po | 124 +++++++++++---------- l10n/bn_BD/settings.po | 10 +- l10n/bs/core.po | 67 ++++++++--- l10n/bs/files.po | 122 ++++++++++---------- l10n/bs/settings.po | 10 +- l10n/ca/core.po | 68 +++++++++--- l10n/ca/files.po | 128 +++++++++++---------- l10n/ca/settings.po | 10 +- l10n/cs_CZ/core.po | 69 +++++++++--- l10n/cs_CZ/files.po | 128 +++++++++++---------- l10n/cs_CZ/settings.po | 22 ++-- l10n/cy_GB/core.po | 68 +++++++++--- l10n/cy_GB/files.po | 126 +++++++++++---------- l10n/cy_GB/settings.po | 10 +- l10n/da/core.po | 66 ++++++++--- l10n/da/files.po | 128 +++++++++++---------- l10n/da/settings.po | 10 +- l10n/de/core.po | 68 +++++++++--- l10n/de/files.po | 128 +++++++++++---------- l10n/de/settings.po | 22 ++-- l10n/de_AT/core.po | 66 ++++++++--- l10n/de_AT/files.po | 122 ++++++++++---------- l10n/de_AT/settings.po | 13 +-- l10n/de_CH/core.po | 66 ++++++++--- l10n/de_CH/files.po | 126 +++++++++++---------- l10n/de_CH/settings.po | 13 +-- l10n/de_DE/core.po | 68 +++++++++--- l10n/de_DE/files.po | 128 +++++++++++---------- l10n/de_DE/settings.po | 22 ++-- l10n/el/core.po | 66 ++++++++--- l10n/el/files.po | 126 +++++++++++---------- l10n/el/settings.po | 10 +- l10n/en@pirate/core.po | 66 ++++++++--- l10n/en@pirate/files.po | 122 ++++++++++---------- l10n/en@pirate/settings.po | 10 +- l10n/en_GB/core.po | 70 +++++++++--- l10n/en_GB/files.po | 128 +++++++++++---------- l10n/en_GB/files_external.po | 4 +- l10n/en_GB/files_sharing.po | 4 +- l10n/en_GB/files_trashbin.po | 20 ++-- l10n/en_GB/files_versions.po | 4 +- l10n/en_GB/settings.po | 26 ++--- l10n/en_GB/user_webdavauth.po | 4 +- l10n/eo/core.po | 66 ++++++++--- l10n/eo/files.po | 126 +++++++++++---------- l10n/eo/settings.po | 10 +- l10n/es/core.po | 66 ++++++++--- l10n/es/files.po | 128 +++++++++++---------- l10n/es/settings.po | 27 ++--- l10n/es_AR/core.po | 66 ++++++++--- l10n/es_AR/files.po | 128 +++++++++++---------- l10n/es_AR/settings.po | 10 +- l10n/es_MX/core.po | 66 ++++++++--- l10n/es_MX/files.po | 122 ++++++++++---------- l10n/es_MX/settings.po | 10 +- l10n/et_EE/core.po | 68 +++++++++--- l10n/et_EE/files.po | 128 +++++++++++---------- l10n/et_EE/settings.po | 22 ++-- l10n/eu/core.po | 66 ++++++++--- l10n/eu/files.po | 126 +++++++++++---------- l10n/eu/settings.po | 10 +- l10n/fa/core.po | 65 ++++++++--- l10n/fa/files.po | 126 +++++++++++---------- l10n/fa/settings.po | 10 +- l10n/fi_FI/core.po | 68 +++++++++--- l10n/fi_FI/files.po | 128 +++++++++++---------- l10n/fi_FI/settings.po | 14 +-- l10n/fr/core.po | 75 ++++++++++--- l10n/fr/files.po | 128 +++++++++++---------- l10n/fr/lib.po | 19 ++-- l10n/fr/settings.po | 17 ++- l10n/gl/core.po | 68 +++++++++--- l10n/gl/files.po | 128 +++++++++++---------- l10n/gl/settings.po | 22 ++-- l10n/he/core.po | 66 ++++++++--- l10n/he/files.po | 126 +++++++++++---------- l10n/he/settings.po | 10 +- l10n/hi/core.po | 66 ++++++++--- l10n/hi/files.po | 90 ++++++++------- l10n/hi/settings.po | 10 +- l10n/hr/core.po | 67 ++++++++--- l10n/hr/files.po | 124 +++++++++++---------- l10n/hr/settings.po | 10 +- l10n/hu_HU/core.po | 66 ++++++++--- l10n/hu_HU/files.po | 126 +++++++++++---------- l10n/hu_HU/settings.po | 10 +- l10n/hy/core.po | 66 ++++++++--- l10n/hy/files.po | 122 ++++++++++---------- l10n/hy/settings.po | 10 +- l10n/ia/core.po | 66 ++++++++--- l10n/ia/files.po | 122 ++++++++++---------- l10n/ia/settings.po | 10 +- l10n/id/core.po | 65 ++++++++--- l10n/id/files.po | 124 +++++++++++---------- l10n/id/settings.po | 10 +- l10n/is/core.po | 66 ++++++++--- l10n/is/files.po | 124 +++++++++++---------- l10n/is/settings.po | 10 +- l10n/it/core.po | 74 +++++++++--- l10n/it/files.po | 128 +++++++++++---------- l10n/it/lib.po | 14 +-- l10n/it/settings.po | 22 ++-- l10n/ja_JP/core.po | 67 ++++++++--- l10n/ja_JP/files.po | 128 +++++++++++---------- l10n/ja_JP/settings.po | 10 +- l10n/ka/core.po | 65 ++++++++--- l10n/ka/files.po | 122 ++++++++++---------- l10n/ka/settings.po | 10 +- l10n/ka_GE/core.po | 65 ++++++++--- l10n/ka_GE/files.po | 126 +++++++++++---------- l10n/ka_GE/settings.po | 10 +- l10n/km/core.po | 65 ++++++++--- l10n/km/files.po | 122 ++++++++++---------- l10n/km/settings.po | 10 +- l10n/kn/core.po | 65 ++++++++--- l10n/kn/files.po | 122 ++++++++++---------- l10n/kn/settings.po | 10 +- l10n/ko/core.po | 65 ++++++++--- l10n/ko/files.po | 126 +++++++++++---------- l10n/ko/settings.po | 10 +- l10n/ku_IQ/core.po | 66 ++++++++--- l10n/ku_IQ/files.po | 122 ++++++++++---------- l10n/ku_IQ/settings.po | 10 +- l10n/lb/core.po | 66 ++++++++--- l10n/lb/files.po | 124 +++++++++++---------- l10n/lb/settings.po | 10 +- l10n/lt_LT/core.po | 69 +++++++++--- l10n/lt_LT/files.po | 128 +++++++++++---------- l10n/lt_LT/settings.po | 10 +- l10n/lv/core.po | 67 ++++++++--- l10n/lv/files.po | 126 +++++++++++---------- l10n/lv/settings.po | 10 +- l10n/mk/core.po | 66 ++++++++--- l10n/mk/files.po | 124 +++++++++++---------- l10n/mk/settings.po | 10 +- l10n/ml_IN/core.po | 66 ++++++++--- l10n/ml_IN/files.po | 122 ++++++++++---------- l10n/ml_IN/settings.po | 10 +- l10n/ms_MY/core.po | 65 ++++++++--- l10n/ms_MY/files.po | 124 +++++++++++---------- l10n/ms_MY/settings.po | 10 +- l10n/my_MM/core.po | 65 ++++++++--- l10n/my_MM/files.po | 122 ++++++++++---------- l10n/my_MM/settings.po | 10 +- l10n/nb_NO/core.po | 66 ++++++++--- l10n/nb_NO/files.po | 126 +++++++++++---------- l10n/nb_NO/settings.po | 10 +- l10n/ne/core.po | 66 ++++++++--- l10n/ne/files.po | 122 ++++++++++---------- l10n/ne/settings.po | 10 +- l10n/nl/core.po | 68 +++++++++--- l10n/nl/files.po | 128 +++++++++++---------- l10n/nl/settings.po | 10 +- l10n/nn_NO/core.po | 66 ++++++++--- l10n/nn_NO/files.po | 128 +++++++++++---------- l10n/nn_NO/settings.po | 10 +- l10n/nqo/core.po | 65 ++++++++--- l10n/nqo/files.po | 122 ++++++++++---------- l10n/nqo/settings.po | 10 +- l10n/oc/core.po | 66 ++++++++--- l10n/oc/files.po | 124 +++++++++++---------- l10n/oc/settings.po | 10 +- l10n/pa/core.po | 68 +++++++++--- l10n/pa/files.po | 92 ++++++++------- l10n/pa/settings.po | 10 +- l10n/pl/core.po | 67 ++++++++--- l10n/pl/files.po | 128 +++++++++++---------- l10n/pl/settings.po | 10 +- l10n/pt_BR/core.po | 68 +++++++++--- l10n/pt_BR/files.po | 128 +++++++++++---------- l10n/pt_BR/settings.po | 22 ++-- l10n/pt_PT/core.po | 75 ++++++++++--- l10n/pt_PT/files.po | 128 +++++++++++---------- l10n/pt_PT/lib.po | 14 +-- l10n/pt_PT/settings.po | 12 +- l10n/ro/core.po | 67 ++++++++--- l10n/ro/files.po | 128 +++++++++++---------- l10n/ro/settings.po | 10 +- l10n/ru/core.po | 82 ++++++++++---- l10n/ru/files.po | 131 ++++++++++++---------- l10n/ru/lib.po | 40 +++---- l10n/ru/settings.po | 41 ++++--- l10n/ru/user_ldap.po | 13 ++- l10n/si_LK/core.po | 66 ++++++++--- l10n/si_LK/files.po | 124 +++++++++++---------- l10n/si_LK/settings.po | 10 +- l10n/sk/core.po | 67 ++++++++--- l10n/sk/files.po | 122 ++++++++++---------- l10n/sk/settings.po | 10 +- l10n/sk_SK/core.po | 67 ++++++++--- l10n/sk_SK/files.po | 126 +++++++++++---------- l10n/sk_SK/settings.po | 10 +- l10n/sl/core.po | 68 +++++++++--- l10n/sl/files.po | 126 +++++++++++---------- l10n/sl/settings.po | 10 +- l10n/sq/core.po | 66 ++++++++--- l10n/sq/files.po | 128 +++++++++++---------- l10n/sq/settings.po | 10 +- l10n/sr/core.po | 67 ++++++++--- l10n/sr/files.po | 126 +++++++++++---------- l10n/sr/settings.po | 10 +- l10n/sr@latin/core.po | 204 ++++++++++++++++++++-------------- l10n/sr@latin/files.po | 128 +++++++++++---------- l10n/sr@latin/files_trashbin.po | 28 ++--- l10n/sr@latin/lib.po | 22 ++-- l10n/sr@latin/settings.po | 14 +-- l10n/sr@latin/user_ldap.po | 6 +- l10n/sv/core.po | 66 ++++++++--- l10n/sv/files.po | 128 +++++++++++---------- l10n/sv/settings.po | 10 +- l10n/sw_KE/core.po | 66 ++++++++--- l10n/sw_KE/files.po | 122 ++++++++++---------- l10n/sw_KE/settings.po | 10 +- l10n/ta_LK/core.po | 66 ++++++++--- l10n/ta_LK/files.po | 126 +++++++++++---------- l10n/ta_LK/settings.po | 10 +- l10n/te/core.po | 66 ++++++++--- l10n/te/files.po | 122 ++++++++++---------- l10n/te/settings.po | 10 +- l10n/templates/core.pot | 64 +++++++++-- l10n/templates/files.pot | 88 ++++++++------- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 8 +- l10n/templates/settings.pot | 8 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/core.po | 65 ++++++++--- l10n/th_TH/files.po | 126 +++++++++++---------- l10n/th_TH/settings.po | 10 +- l10n/tr/core.po | 66 ++++++++--- l10n/tr/files.po | 126 +++++++++++---------- l10n/tr/settings.po | 10 +- l10n/ug/core.po | 65 ++++++++--- l10n/ug/files.po | 122 ++++++++++---------- l10n/ug/settings.po | 10 +- l10n/uk/core.po | 67 ++++++++--- l10n/uk/files.po | 128 +++++++++++---------- l10n/uk/settings.po | 10 +- l10n/ur_PK/core.po | 66 ++++++++--- l10n/ur_PK/files.po | 122 ++++++++++---------- l10n/ur_PK/settings.po | 10 +- l10n/vi/core.po | 65 ++++++++--- l10n/vi/files.po | 126 +++++++++++---------- l10n/vi/settings.po | 10 +- l10n/zh_CN/core.po | 65 ++++++++--- l10n/zh_CN/files.po | 126 +++++++++++---------- l10n/zh_CN/settings.po | 10 +- l10n/zh_HK/core.po | 65 ++++++++--- l10n/zh_HK/files.po | 122 ++++++++++---------- l10n/zh_HK/settings.po | 10 +- l10n/zh_TW/core.po | 65 ++++++++--- l10n/zh_TW/files.po | 128 +++++++++++---------- l10n/zh_TW/settings.po | 10 +- lib/l10n/fr.php | 3 + lib/l10n/it.php | 4 +- lib/l10n/pt_PT.php | 2 + lib/l10n/ru.php | 13 +++ lib/l10n/sr@latin.php | 8 +- settings/l10n/cs_CZ.php | 6 + settings/l10n/de.php | 6 + settings/l10n/de_AT.php | 5 + settings/l10n/de_CH.php | 2 +- settings/l10n/de_DE.php | 6 + settings/l10n/en_GB.php | 10 +- settings/l10n/es.php | 8 ++ settings/l10n/et_EE.php | 6 + settings/l10n/fi_FI.php | 2 + settings/l10n/fr.php | 3 + settings/l10n/gl.php | 6 + settings/l10n/it.php | 6 + settings/l10n/pt_BR.php | 6 + settings/l10n/pt_PT.php | 1 + settings/l10n/ru.php | 15 +++ settings/l10n/sr@latin.php | 2 + 441 files changed, 10867 insertions(+), 7022 deletions(-) create mode 100644 settings/l10n/de_AT.php (limited to 'lib') diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index 99eb409a369..67a3414819b 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "المجلد المؤقت غير موجود", "Failed to write to disk" => "خطأ في الكتابة على القرص الصلب", "Not enough storage available" => "لا يوجد مساحة تخزينية كافية", -"Upload failed" => "عملية الرفع فشلت", "Invalid directory." => "مسار غير صحيح.", "Files" => "الملفات", -"Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت", "Not enough space available" => "لا توجد مساحة كافية", "Upload cancelled." => "تم إلغاء عملية رفع الملفات .", "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","","","","",""), "{dirs} and {files}" => "{dirs} و {files}", "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""), -"files uploading" => "يتم تحميل الملفات", "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.", "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 913875e863a..e7dafd1c43a 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -6,7 +6,6 @@ $TRANSLATIONS = array( "No file was uploaded" => "Фахлът не бе качен", "Missing a temporary folder" => "Липсва временна папка", "Failed to write to disk" => "Възникна проблем при запис в диска", -"Upload failed" => "Качването е неуспешно", "Invalid directory." => "Невалидна директория.", "Files" => "Файлове", "Upload cancelled." => "Качването е спряно.", diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php index 2265c232a14..66ac3a2165f 100644 --- a/apps/files/l10n/bn_BD.php +++ b/apps/files/l10n/bn_BD.php @@ -12,7 +12,6 @@ $TRANSLATIONS = array( "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ", "Invalid directory." => "ভুল ডিরেক্টরি", "Files" => "ফাইল", -"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট", "Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই", "Upload cancelled." => "আপলোড বাতিল করা হয়েছে।", "File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index eb724d19548..8fd72ac0a68 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un fitxer temporal", "Failed to write to disk" => "Ha fallat en escriure al disc", "Not enough storage available" => "No hi ha prou espai disponible", -"Upload failed" => "La pujada ha fallat", "Invalid directory." => "Directori no vàlid.", "Files" => "Fitxers", -"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes", "Not enough space available" => "No hi ha prou espai disponible", "Upload cancelled." => "La pujada s'ha cancel·lat.", "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "{dirs} and {files}" => "{dirs} i {files}", "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), -"files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", "File name cannot be empty." => "El nom del fitxer no pot ser buit.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 691cc92f1ad..f67283ec6e8 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", "Failed to write to disk" => "Zápis na disk selhal", "Not enough storage available" => "Nedostatek dostupného úložného prostoru", -"Upload failed" => "Odesílání selhalo", "Invalid directory." => "Neplatný adresář", "Files" => "Soubory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů", "Not enough space available" => "Nedostatek volného místa", "Upload cancelled." => "Odesílání zrušeno.", "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "{dirs} and {files}" => "{dirs} a {files}", "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"), -"files uploading" => "soubory se odesílají", "'.' is an invalid file name." => "'.' je neplatným názvem souboru.", "File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index 157f4f89a23..86e5f65e7b0 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Plygell dros dro yn eisiau", "Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg", "Not enough storage available" => "Dim digon o le storio ar gael", -"Upload failed" => "Methwyd llwytho i fyny", "Invalid directory." => "Cyfeiriadur annilys.", "Files" => "Ffeiliau", -"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit", "Not enough space available" => "Dim digon o le ar gael", "Upload cancelled." => "Diddymwyd llwytho i fyny.", "File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","","",""), "_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), -"files uploading" => "ffeiliau'n llwytho i fyny", "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.", "File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index aab12986ec1..c2a20931ba0 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglende midlertidig mappe.", "Failed to write to disk" => "Fejl ved skrivning til disk.", "Not enough storage available" => "Der er ikke nok plads til rådlighed", -"Upload failed" => "Upload fejlede", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.", "Not enough space available" => "ikke nok tilgængelig ledig plads ", "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.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} og {files}", "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"), -"files uploading" => "uploader filer", "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.", "File name cannot be empty." => "Filnavnet kan ikke stå tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 947d4f07461..64017b7dba6 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", "Not enough space available" => "Nicht genug Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php index 2895135d17e..a7074a8b1cc 100644 --- a/apps/files/l10n/de_CH.php +++ b/apps/files/l10n/de_CH.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist.", "Not enough space available" => "Nicht genügend Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","%n Ordner"), "_%n file_::_%n files_" => array("","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index db07ed7fadd..4f9da434455 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", "Not enough space available" => "Nicht genügend Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 8c89e5e1feb..37a61c6b956 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος", "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο", "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος", -"Upload failed" => "Η μεταφόρτωση απέτυχε", "Invalid directory." => "Μη έγκυρος φάκελος.", "Files" => "Αρχεία", -"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", "Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος", "Upload cancelled." => "Η αποστολή ακυρώθηκε.", "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"), "_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"), "_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"), -"files uploading" => "αρχεία ανεβαίνουν", "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.", "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.", diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php index a13399a8db3..e67719efba9 100644 --- a/apps/files/l10n/en_GB.php +++ b/apps/files/l10n/en_GB.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Missing a temporary folder", "Failed to write to disk" => "Failed to write to disk", "Not enough storage available" => "Not enough storage available", -"Upload failed" => "Upload failed", "Invalid directory." => "Invalid directory.", "Files" => "Files", -"Unable to upload your file as it is a directory or has 0 bytes" => "Unable to upload your file as it is a directory or has 0 bytes", "Not enough space available" => "Not enough space available", "Upload cancelled." => "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.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n file","%n files"), "{dirs} and {files}" => "{dirs} and {files}", "_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"), -"files uploading" => "files uploading", "'.' is an invalid file name." => "'.' is an invalid file name.", "File name cannot be empty." => "File name cannot be empty.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index ad538f2f2a9..eb6e6ba2d39 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mankas provizora dosierujo.", "Failed to write to disk" => "Malsukcesis skribo al disko", "Not enough storage available" => "Ne haveblas sufiĉa memoro", -"Upload failed" => "Alŝuto malsukcesis", "Invalid directory." => "Nevalida dosierujo.", "Files" => "Dosieroj", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn", "Not enough space available" => "Ne haveblas sufiĉa spaco", "Upload cancelled." => "La alŝuto nuliĝis.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", @@ -34,7 +32,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "dosieroj estas alŝutataj", "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.", "File name cannot be empty." => "Dosiernomo devas ne malpleni.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index ce92ff8f187..90d760587d9 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta la carpeta temporal", "Failed to write to disk" => "Falló al escribir al disco", "Not enough storage available" => "No hay suficiente espacio disponible", -"Upload failed" => "Error en la subida", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes", "Not enough space available" => "No hay suficiente espacio disponible", "Upload cancelled." => "Subida cancelada.", "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","%n archivos"), "{dirs} and {files}" => "{dirs} y {files}", "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), -"files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", "File name cannot be empty." => "El nombre de archivo no puede estar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index d9d10362630..be16f3f99ae 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un directorio temporal", "Failed to write to disk" => "Error al escribir en el disco", "Not enough storage available" => "No hay suficiente almacenamiento", -"Upload failed" => "Error al subir el archivo", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes", "Not enough space available" => "No hay suficiente espacio disponible", "Upload cancelled." => "La subida fue cancelada", "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n archivo","%n archivos"), "{dirs} and {files}" => "{carpetas} y {archivos}", "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), -"files uploading" => "Subiendo archivos", "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.", "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 52ba1191706..9f674b27e63 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Ajutiste failide kaust puudub", "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus", "Not enough storage available" => "Saadaval pole piisavalt ruumi", -"Upload failed" => "Üleslaadimine ebaõnnestus", "Invalid directory." => "Vigane kaust.", "Files" => "Failid", -"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti", "Not enough space available" => "Pole piisavalt ruumi", "Upload cancelled." => "Üleslaadimine tühistati.", "File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fail","%n faili"), "{dirs} and {files}" => "{dirs} ja {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), -"files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", "File name cannot be empty." => "Faili nimi ei saa olla tühi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 524be56af02..33ea47d5f04 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Aldi bateko karpeta falta da", "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan", "Not enough storage available" => "Ez dago behar aina leku erabilgarri,", -"Upload failed" => "igotzeak huts egin du", "Invalid directory." => "Baliogabeko karpeta.", "Files" => "Fitxategiak", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako", "Not enough space available" => "Ez dago leku nahikorik.", "Upload cancelled." => "Igoera ezeztatuta", "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), "_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"), -"files uploading" => "fitxategiak igotzen", "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.", "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index 24584f715b5..46d7cfe73ef 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "یک پوشه موقت گم شده", "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود", "Not enough storage available" => "فضای کافی در دسترس نیست", -"Upload failed" => "بارگزاری ناموفق بود", "Invalid directory." => "فهرست راهنما نامعتبر می باشد.", "Files" => "پرونده‌ها", -"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد", "Not enough space available" => "فضای کافی در دسترس نیست", "Upload cancelled." => "بار گذاری لغو شد", "File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "بارگذاری فایل ها", "'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.", "File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 1d29dbf79d2..ab443b28649 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Tilapäiskansio puuttuu", "Failed to write to disk" => "Levylle kirjoitus epäonnistui", "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä", -"Upload failed" => "Lähetys epäonnistui", "Invalid directory." => "Virheellinen kansio.", "Files" => "Tiedostot", -"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.", "Not enough space available" => "Tilaa ei ole riittävästi", "Upload cancelled." => "Lähetys peruttu.", "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 2d538262a0a..d6470458083 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Absence de dossier temporaire.", "Failed to write to disk" => "Erreur d'écriture sur le disque", "Not enough storage available" => "Plus assez d'espace de stockage disponible", -"Upload failed" => "Échec de l'envoi", "Invalid directory." => "Dossier invalide.", "Files" => "Fichiers", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle", "Not enough space available" => "Espace disponible insuffisant", "Upload cancelled." => "Envoi annulé.", "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fichier","%n fichiers"), "{dirs} and {files}" => "{dir} et {files}", "_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"), -"files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", "File name cannot be empty." => "Le nom de fichier ne peut être vide.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 01a6b54f842..0eba94f7d60 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta o cartafol temporal", "Failed to write to disk" => "Produciuse un erro ao escribir no disco", "Not enough storage available" => "Non hai espazo de almacenamento abondo", -"Upload failed" => "Produciuse un fallou no envío", "Invalid directory." => "O directorio é incorrecto.", "Files" => "Ficheiros", -"Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes", "Not enough space available" => "O espazo dispoñíbel é insuficiente", "Upload cancelled." => "Envío cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), -"files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 40d7cc9c552..bc7ecdb0716 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "תקיה זמנית חסרה", "Failed to write to disk" => "הכתיבה לכונן נכשלה", "Not enough storage available" => "אין די שטח פנוי באחסון", -"Upload failed" => "ההעלאה נכשלה", "Invalid directory." => "תיקייה שגויה.", "Files" => "קבצים", -"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים", "Upload cancelled." => "ההעלאה בוטלה.", "File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "URL cannot be empty." => "קישור אינו יכול להיות ריק.", @@ -32,7 +30,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "קבצים בהעלאה", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.", "Name" => "שם", "Size" => "גודל", diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index 57f1ad9700b..60f1da84409 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nedostaje privremeni direktorij", "Failed to write to disk" => "Neuspjelo pisanje na disk", "Files" => "Datoteke", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij", "Upload cancelled." => "Slanje poništeno.", "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.", "Error" => "Greška", @@ -21,7 +20,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "datoteke se učitavaju", "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja promjena", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 66edbefbca5..5d313ff2488 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", "Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Not enough storage available" => "Nincs elég szabad hely.", -"Upload failed" => "A feltöltés nem sikerült", "Invalid directory." => "Érvénytelen mappa.", "Files" => "Fájlok", -"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ű", "Not enough space available" => "Nincs elég szabad hely", "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.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "fájl töltődik föl", "'.' is an invalid file name." => "'.' fájlnév érvénytelen.", "File name cannot be empty." => "A fájlnév nem lehet semmi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index ce7cfe5ef4c..c8b3194eb6b 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Not enough storage available" => "Ruang penyimpanan tidak mencukupi", "Invalid directory." => "Direktori tidak valid.", "Files" => "Berkas", -"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte", "Not enough space available" => "Ruang penyimpanan tidak mencukupi", "Upload cancelled." => "Pengunggahan dibatalkan.", "File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", @@ -32,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "berkas diunggah", "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.", "File name cannot be empty." => "Nama berkas tidak boleh kosong.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.", diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php index 2cf195d0a11..ef493418206 100644 --- a/apps/files/l10n/is.php +++ b/apps/files/l10n/is.php @@ -12,7 +12,6 @@ $TRANSLATIONS = array( "Failed to write to disk" => "Tókst ekki að skrifa á disk", "Invalid directory." => "Ógild mappa.", "Files" => "Skrár", -"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.", "Not enough space available" => "Ekki nægt pláss tiltækt", "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.", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index b0ec954d907..6eef9c4f69c 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manca una cartella temporanea", "Failed to write to disk" => "Scrittura su disco non riuscita", "Not enough storage available" => "Spazio di archiviazione insufficiente", -"Upload failed" => "Caricamento non riuscito", "Invalid directory." => "Cartella non valida.", "Files" => "File", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte", "Not enough space available" => "Spazio disponibile insufficiente", "Upload cancelled." => "Invio annullato", "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n file","%n file"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"), -"files uploading" => "caricamento file", "'.' is an invalid file name." => "'.' non è un nome file valido.", "File name cannot be empty." => "Il nome del file non può essere vuoto.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 5438cbb4976..5944b47434d 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "一時保存フォルダが見つかりません", "Failed to write to disk" => "ディスクへの書き込みに失敗しました", "Not enough storage available" => "ストレージに十分な空き容量がありません", -"Upload failed" => "アップロードに失敗", "Invalid directory." => "無効なディレクトリです。", "Files" => "ファイル", -"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません", "Not enough space available" => "利用可能なスペースが十分にありません", "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n個のファイル"), "{dirs} and {files}" => "{dirs} と {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"), -"files uploading" => "ファイルをアップロード中", "'.' is an invalid file name." => "'.' は無効なファイル名です。", "File name cannot be empty." => "ファイル名を空にすることはできません。", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。", diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 455e3211a55..b9313957714 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს", "Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას", "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის", -"Upload failed" => "ატვირთვა ვერ განხორციელდა", "Invalid directory." => "დაუშვებელი დირექტორია.", "Files" => "ფაილები", -"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს", "Not enough space available" => "საკმარისი ადგილი არ არის", "Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.", "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "ფაილები იტვირთება", "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.", "File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და '*' არ არის დაიშვებული.", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index e2b787e7f91..502acefcf3a 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "임시 폴더가 없음", "Failed to write to disk" => "디스크에 쓰지 못했습니다", "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.", -"Upload failed" => "업로드 실패", "Invalid directory." => "올바르지 않은 디렉터리입니다.", "Files" => "파일", -"Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다", "Not enough space available" => "여유 공간이 부족합니다", "Upload cancelled." => "업로드가 취소되었습니다.", "File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "파일 업로드중", "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.", "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.", diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index deefe9caa15..cd68b2b9ad2 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Et feelt en temporären Dossier", "Failed to write to disk" => "Konnt net op den Disk schreiwen", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.", "Upload cancelled." => "Upload ofgebrach.", "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Error" => "Fehler", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 83ed8e8688f..2b32a129d55 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nėra laikinojo katalogo", "Failed to write to disk" => "Nepavyko įrašyti į diską", "Not enough storage available" => "Nepakanka vietos serveryje", -"Upload failed" => "Nusiuntimas nepavyko", "Invalid directory." => "Neteisingas aplankas", "Files" => "Failai", -"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas", "Not enough space available" => "Nepakanka vietos", "Upload cancelled." => "Įkėlimas atšauktas.", "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"), "{dirs} and {files}" => "{dirs} ir {files}", "_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"), -"files uploading" => "įkeliami failai", "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", "File name cannot be empty." => "Failo pavadinimas negali būti tuščias.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index d24aaca9e4c..cefaea62818 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Trūkst pagaidu mapes", "Failed to write to disk" => "Neizdevās saglabāt diskā", "Not enough storage available" => "Nav pietiekami daudz vietas", -"Upload failed" => "Neizdevās augšupielādēt", "Invalid directory." => "Nederīga direktorija.", "Files" => "Datnes", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela", "Not enough space available" => "Nepietiek brīvas vietas", "Upload cancelled." => "Augšupielāde ir atcelta.", "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), "_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"), -"files uploading" => "fails augšupielādējas", "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.", "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.", diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index 7a9a8641f80..2306db6921a 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -9,7 +9,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Недостасува привремена папка", "Failed to write to disk" => "Неуспеав да запишам на диск", "Files" => "Датотеки", -"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти", "Upload cancelled." => "Преземањето е прекинато.", "File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "URL cannot be empty." => "Адресата неможе да биде празна.", diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 59d0bbfb339..61bbf81cd8a 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -8,7 +8,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Direktori sementara hilang", "Failed to write to disk" => "Gagal untuk disimpan", "Files" => "Fail-fail", -"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes", "Upload cancelled." => "Muatnaik dibatalkan.", "Error" => "Ralat", "Share" => "Kongsi", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 55ce978d2a2..8fda251a2bc 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mangler midlertidig mappe", "Failed to write to disk" => "Klarte ikke å skrive til disk", "Not enough storage available" => "Ikke nok lagringsplass", -"Upload failed" => "Opplasting feilet", "Invalid directory." => "Ugyldig katalog.", "Files" => "Filer", -"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", "Not enough space available" => "Ikke nok lagringsplass", "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.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), "_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"), -"files uploading" => "filer lastes opp", "'.' is an invalid file name." => "'.' er et ugyldig filnavn.", "File name cannot be empty." => "Filnavn kan ikke være tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 8e9454e7945..65ad5265237 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Er ontbreekt een tijdelijke map", "Failed to write to disk" => "Schrijven naar schijf mislukt", "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar", -"Upload failed" => "Upload mislukt", "Invalid directory." => "Ongeldige directory.", "Files" => "Bestanden", -"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is", "Not enough space available" => "Niet genoeg ruimte beschikbaar", "Upload cancelled." => "Uploaden geannuleerd.", "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","%n bestanden"), "{dirs} and {files}" => "{dirs} en {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"), -"files uploading" => "bestanden aan het uploaden", "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.", "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 58aafac27c4..04c47c31fbb 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglar ei mellombels mappe", "Failed to write to disk" => "Klarte ikkje skriva til disk", "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg", -"Upload failed" => "Feil ved opplasting", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte", "Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg", "Upload cancelled." => "Opplasting avbroten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} og {files}", "_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"), -"files uploading" => "filer lastar opp", "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.", "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 63e572059bf..a6d8f91458e 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Un dorsièr temporari manca", "Failed to write to disk" => "L'escriptura sul disc a fracassat", "Files" => "Fichièrs", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.", "Upload cancelled." => "Amontcargar anullat.", "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ", "Error" => "Error", @@ -21,7 +20,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "fichièrs al amontcargar", "Name" => "Nom", "Size" => "Talha", "Modified" => "Modificat", diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php index b28cb29622f..d8c50f2d1bc 100644 --- a/apps/files/l10n/pa.php +++ b/apps/files/l10n/pa.php @@ -1,6 +1,5 @@ "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ", "Files" => "ਫਾਇਲਾਂ", "Error" => "ਗਲਤੀ", "Share" => "ਸਾਂਝਾ ਕਰੋ", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index d8edf7173a8..3ad80975810 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Brak folderu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", "Not enough storage available" => "Za mało dostępnego miejsca", -"Upload failed" => "Wysyłanie nie powiodło się", "Invalid directory." => "Zła ścieżka.", "Files" => "Pliki", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów", "Not enough space available" => "Za mało miejsca", "Upload cancelled." => "Wczytywanie anulowane.", "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"), "{dirs} and {files}" => "{katalogi} and {pliki}", "_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"), -"files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", "File name cannot be empty." => "Nazwa pliku nie może być pusta.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index f9915f251b4..e7370491b58 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Pasta temporária não encontrada", "Failed to write to disk" => "Falha ao escrever no disco", "Not enough storage available" => "Espaço de armazenamento insuficiente", -"Upload failed" => "Falha no envio", "Invalid directory." => "Diretório inválido.", "Files" => "Arquivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.", "Not enough space available" => "Espaço de armazenamento insuficiente", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n arquivo","%n arquivos"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"), -"files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", "File name cannot be empty." => "O nome do arquivo não pode estar vazio.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 33ec8cddce6..f6d61fc9873 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Está a faltar a pasta temporária", "Failed to write to disk" => "Falhou a escrita no disco", "Not enough storage available" => "Não há espaço suficiente em disco", -"Upload failed" => "Carregamento falhou", "Invalid directory." => "Directório Inválido", "Files" => "Ficheiros", -"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes", "Not enough space available" => "Espaço em disco insuficiente!", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"), -"files uploading" => "A enviar os ficheiros", "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!", "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 0a96eaa2479..481e070eacc 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Lipsește un dosar temporar", "Failed to write to disk" => "Eroare la scrierea discului", "Not enough storage available" => "Nu este suficient spațiu disponibil", -"Upload failed" => "Încărcarea a eșuat", "Invalid directory." => "registru invalid.", "Files" => "Fișiere", -"Unable to upload your file as it is a directory or has 0 bytes" => "lista nu se poate incarca poate fi un fisier sau are 0 bytes", "Not enough space available" => "Nu este suficient spațiu disponibil", "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.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "fișiere se încarcă", "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 96f52a9045c..083df116f66 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Отсутствует временная папка", "Failed to write to disk" => "Ошибка записи на диск", "Not enough storage available" => "Недостаточно доступного места в хранилище", -"Upload failed" => "Ошибка загрузки", "Invalid directory." => "Неправильный каталог.", "Files" => "Файлы", -"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.", "Not enough space available" => "Недостаточно свободного места", "Upload cancelled." => "Загрузка отменена.", "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.", @@ -35,13 +33,14 @@ $TRANSLATIONS = array( "undo" => "отмена", "_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), "_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), +"{dirs} and {files}" => "{dirs} и {files}", "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"), -"files uploading" => "файлы загружаются", "'.' is an invalid file name." => "'.' - неправильное имя файла.", "File name cannot be empty." => "Имя файла не может быть пустым.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.", "Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.", "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы.", "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.", "Name" => "Имя", "Size" => "Размер", diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index 1fd18d0c56f..7d24370a092 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි", "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්", "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි", -"Upload failed" => "උඩුගත කිරීම අසාර්ථකයි", "Files" => "ගොනු", "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී", "File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index b30f263d244..962ce7d7e9b 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chýba dočasný priečinok", "Failed to write to disk" => "Zápis na disk sa nepodaril", "Not enough storage available" => "Nedostatok dostupného úložného priestoru", -"Upload failed" => "Odoslanie bolo neúspešné", "Invalid directory." => "Neplatný priečinok.", "Files" => "Súbory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov", "Not enough space available" => "Nie je k dispozícii dostatok miesta", "Upload cancelled." => "Odosielanie zrušené.", "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), "_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"), -"files uploading" => "nahrávanie súborov", "'.' is an invalid file name." => "'.' je neplatné meno súboru.", "File name cannot be empty." => "Meno súboru nemôže byť prázdne", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 08f789ff866..7190753eac9 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", "Not enough storage available" => "Na voljo ni dovolj prostora", -"Upload failed" => "Pošiljanje je spodletelo", "Invalid directory." => "Neveljavna mapa.", "Files" => "Datoteke", -"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.", "Not enough space available" => "Na voljo ni dovolj prostora.", "Upload cancelled." => "Pošiljanje je preklicano.", "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","","",""), "_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), -"files uploading" => "poteka pošiljanje datotek", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", "File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.", diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index 3207e3a165c..ecc066a284c 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Një dosje e përkohshme nuk u gjet", "Failed to write to disk" => "Ruajtja në disk dështoi", "Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme", -"Upload failed" => "Ngarkimi dështoi", "Invalid directory." => "Dosje e pavlefshme.", "Files" => "Skedarët", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte", "Not enough space available" => "Nuk ka hapësirë memorizimi e mjaftueshme", "Upload cancelled." => "Ngarkimi u anulua.", "File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n skedar","%n skedarë"), "{dirs} and {files}" => "{dirs} dhe {files}", "_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"), -"files uploading" => "po ngarkoj skedarët", "'.' is an invalid file name." => "'.' është emër i pavlefshëm.", "File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index 73f8ace5c81..fd3b2a2912f 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Недостаје привремена фасцикла", "Failed to write to disk" => "Не могу да пишем на диск", "Not enough storage available" => "Нема довољно простора", -"Upload failed" => "Отпремање није успело", "Invalid directory." => "неисправна фасцикла.", "Files" => "Датотеке", -"Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова", "Not enough space available" => "Нема довољно простора", "Upload cancelled." => "Отпремање је прекинуто.", "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "датотеке се отпремају", "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.", "File name cannot be empty." => "Име датотеке не може бити празно.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index 1965479fe66..8831d1a1bef 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "No file was uploaded" => "Nijedan fajl nije poslat", "Missing a temporary folder" => "Nedostaje privremena fascikla", "Files" => "Fajlovi", +"Error" => "Greška", +"Share" => "Podeli", "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), @@ -17,6 +19,7 @@ $TRANSLATIONS = array( "Save" => "Snimi", "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!", "Download" => "Preuzmi", +"Unshare" => "Ukljoni deljenje", "Delete" => "Obriši", "Upload too large" => "Pošiljka je prevelika", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index fbbe1f15910..208dcd4ea12 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "En temporär mapp saknas", "Failed to write to disk" => "Misslyckades spara till disk", "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt", -"Upload failed" => "Misslyckad uppladdning", "Invalid directory." => "Felaktig mapp.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes", "Not enough space available" => "Inte tillräckligt med utrymme tillgängligt", "Upload cancelled." => "Uppladdning avbruten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} och {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"), -"files uploading" => "filer laddas upp", "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.", "File name cannot be empty." => "Filnamn kan inte vara tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.", diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index 154e0d6796e..f05990b94f0 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -7,9 +7,7 @@ $TRANSLATIONS = array( "No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை", "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை", -"Upload failed" => "பதிவேற்றல் தோல்வியுற்றது", "Files" => "கோப்புகள்", -"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை", "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", "File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "URL cannot be empty." => "URL வெறுமையாக இருக்கமுடியாது.", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index aa8cf4e9b50..37144ebc883 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย", "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว", "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน", -"Upload failed" => "อัพโหลดล้มเหลว", "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" => "ไฟล์", -"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์", "Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ", "Upload cancelled." => "การอัพโหลดถูกยกเลิก", "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", @@ -32,7 +30,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "การอัพโหลดไฟล์", "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง", "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index dd089757d5f..8cb05e16ace 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Geçici dizin eksik", "Failed to write to disk" => "Diske yazılamadı", "Not enough storage available" => "Yeterli disk alanı yok", -"Upload failed" => "Yükleme başarısız", "Invalid directory." => "Geçersiz dizin.", "Files" => "Dosyalar", -"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", "Not enough space available" => "Yeterli disk alanı yok", "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.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), "_%n file_::_%n files_" => array("%n dosya","%n dosya"), "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"), -"files uploading" => "Dosyalar yükleniyor", "'.' is an invalid file name." => "'.' geçersiz dosya adı.", "File name cannot be empty." => "Dosya adı boş olamaz.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.", diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php index 920d077e4eb..a38ce706ef9 100644 --- a/apps/files/l10n/ug.php +++ b/apps/files/l10n/ug.php @@ -23,7 +23,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ", "Name" => "ئاتى", "Size" => "چوڭلۇقى", "Modified" => "ئۆزگەرتكەن", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index bea1d930799..fac7cea529a 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -12,10 +12,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Відсутній тимчасовий каталог", "Failed to write to disk" => "Невдалося записати на диск", "Not enough storage available" => "Місця більше немає", -"Upload failed" => "Помилка завантаження", "Invalid directory." => "Невірний каталог.", "Files" => "Файли", -"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт", "Not enough space available" => "Місця більше немає", "Upload cancelled." => "Завантаження перервано.", "File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.", @@ -34,7 +32,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "файли завантажуються", "'.' is an invalid file name." => "'.' це невірне ім'я файлу.", "File name cannot be empty." => " Ім'я файлу не може бути порожнім.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index b98a14f6d7b..2d63128aa26 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Không tìm thấy thư mục tạm", "Failed to write to disk" => "Không thể ghi ", "Not enough storage available" => "Không đủ không gian lưu trữ", -"Upload failed" => "Tải lên thất bại", "Invalid directory." => "Thư mục không hợp lệ", "Files" => "Tập tin", -"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte", "Not enough space available" => "Không đủ chỗ trống cần thiết", "Upload cancelled." => "Hủy tải lên", "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "tệp tin đang được tải lên", "'.' is an invalid file name." => "'.' là một tên file không hợp lệ", "File name cannot be empty." => "Tên file không được rỗng", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 59b09ad950b..b739b72ce7e 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "缺少临时目录", "Failed to write to disk" => "写入磁盘失败", "Not enough storage available" => "没有足够的存储空间", -"Upload failed" => "上传失败", "Invalid directory." => "无效文件夹。", "Files" => "文件", -"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件", "Not enough space available" => "没有足够可用空间", "Upload cancelled." => "上传已取消", "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n 文件夹"), "_%n file_::_%n files_" => array("%n个文件"), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "文件上传中", "'.' is an invalid file name." => "'.' 是一个无效的文件名。", "File name cannot be empty." => "文件名不能为空。", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 21c929f81a6..214812d7ada 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "找不到暫存資料夾", "Failed to write to disk" => "寫入硬碟失敗", "Not enough storage available" => "儲存空間不足", -"Upload failed" => "上傳失敗", "Invalid directory." => "無效的資料夾", "Files" => "檔案", -"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0", "Not enough space available" => "沒有足夠的可用空間", "Upload cancelled." => "上傳已取消", "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n 個檔案"), "{dirs} and {files}" => "{dirs} 和 {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"), -"files uploading" => "檔案上傳中", "'.' is an invalid file name." => "'.' 是不合法的檔名", "File name cannot be empty." => "檔名不能為空", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元", diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php index bcfcfc86240..be9d8b9f520 100644 --- a/apps/files_trashbin/l10n/en_GB.php +++ b/apps/files_trashbin/l10n/en_GB.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Delete permanently", "Name" => "Name", "Deleted" => "Deleted", -"_%n folder_::_%n folders_" => array("","%n folders"), -"_%n file_::_%n files_" => array("","%n files"), +"_%n folder_::_%n folders_" => array("%n folder","%n folders"), +"_%n file_::_%n files_" => array("%n file","%n files"), "restored" => "restored", "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!", "Restore" => "Restore", diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php index 483d1e3ca2b..fa30afcf4bf 100644 --- a/apps/files_trashbin/l10n/sr@latin.php +++ b/apps/files_trashbin/l10n/sr@latin.php @@ -1,5 +1,6 @@ "Greška", "Name" => "Ime", "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index f26e26f1e77..40cab1c5418 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -40,6 +40,7 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.", "Backup (Replica) Port" => "Порт резервного сервера", "Disable Main Server" => "Отключение главного сервера", +"Only connect to the replica server." => "Только подключение к серверу реплик.", "Use TLS" => "Использовать TLS", "Do not use it additionally for LDAPS connections, it will fail." => "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает.", "Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)", @@ -48,11 +49,13 @@ $TRANSLATIONS = array( "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.", "Directory Settings" => "Настройки каталога", "User Display Name Field" => "Поле отображаемого имени пользователя", +"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.", "Base User Tree" => "База пользовательского дерева", "One User Base DN per line" => "По одной базовому DN пользователей в строке.", "User Search Attributes" => "Поисковые атрибуты пользователя", "Optional; one attribute per line" => "Опционально; один атрибут на линию", "Group Display Name Field" => "Поле отображаемого имени группы", +"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени группы.", "Base Group Tree" => "База группового дерева", "One Group Base DN per line" => "По одной базовому DN групп в строке.", "Group Search Attributes" => "Атрибуты поиска для группы", diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php index 07db505ecf3..24fff94fc65 100644 --- a/apps/user_ldap/l10n/sr@latin.php +++ b/apps/user_ldap/l10n/sr@latin.php @@ -1,5 +1,6 @@ "Greška", "Password" => "Lozinka", "Help" => "Pomoć" ); diff --git a/core/l10n/ach.php b/core/l10n/ach.php index 25f1137e8cd..2cbbaa45ca7 100644 --- a/core/l10n/ach.php +++ b/core/l10n/ach.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php index 41447055609..6a0bbc53ac9 100644 --- a/core/l10n/af_ZA.php +++ b/core/l10n/af_ZA.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Password" => "Wagwoord", "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", "You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 17c3ab293c6..62a9580b12c 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "نعم", "No" => "لا", "Ok" => "موافق", +"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""), "The object type is not specified." => "نوع العنصر غير محدد.", "Error" => "خطأ", "The app name is not specified." => "اسم التطبيق غير محدد.", diff --git a/core/l10n/be.php b/core/l10n/be.php index 83f0d99a2e4..2481806bcb9 100644 --- a/core/l10n/be.php +++ b/core/l10n/be.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("","","",""), "_%n day ago_::_%n days ago_" => array("","","",""), "_%n month ago_::_%n months ago_" => array("","","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "Advanced" => "Дасведчаны", "Finish setup" => "Завяршыць ўстаноўку." ); diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 8afe42f206b..a4f1585420a 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -34,6 +34,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "Добре", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Грешка", "Share" => "Споделяне", "Share with" => "Споделено с", diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index 5e65d681ec2..aaf982b9e52 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "Yes" => "হ্যাঁ", "No" => "না", "Ok" => "তথাস্তু", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।", "Error" => "সমস্যা", "The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।", diff --git a/core/l10n/bs.php b/core/l10n/bs.php index 885518f9136..ee8196e9741 100644 --- a/core/l10n/bs.php +++ b/core/l10n/bs.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("","",""), "_%n day ago_::_%n days ago_" => array("","",""), "_%n month ago_::_%n months ago_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "Share" => "Podijeli", "Add" => "Dodaj" ); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index bc1960053a7..448fbae0ad8 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "D'acord", "Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "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ó.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index aa5fd620c3e..9ee5dd471f1 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Ok", "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 1f6c50524b3..a8b1e894e70 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Ie", "No" => "Na", "Ok" => "Iawn", +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.", "Error" => "Gwall", "The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 3fd0fff94ef..0f7f8cfc63b 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nej", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen er ikke angivet.", "Error" => "Fejl", "The app name is not specified." => "Den app navn er ikke angivet.", diff --git a/core/l10n/de.php b/core/l10n/de.php index 934e227f91f..302ebe2f2f9 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/de_AT.php +++ b/core/l10n/de_AT.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 5ac614b2575..7e2d4d9f152 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nein", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 652ef737b68..30825d5b4bb 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/el.php b/core/l10n/el.php index 6e0733b7060..929caad1dc7 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Ναι", "No" => "Όχι", "Ok" => "Οκ", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.", "Error" => "Σφάλμα", "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.", diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php index 997d1f88c46..461a44dd235 100644 --- a/core/l10n/en@pirate.php +++ b/core/l10n/en@pirate.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Password" => "Passcode" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index 2d588ab2431..05d945be6db 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", @@ -100,7 +101,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator .", "Request failed!
      Did you make sure your email/username was right?" => "Request failed!
      Did you make sure your email/username was correct?", -"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.", +"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.", "Username" => "Username", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", "Yes, I really want to reset my password now" => "Yes, I really want to reset my password now", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 669f677d46d..d86c2bfacda 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jes", "No" => "Ne", "Ok" => "Akcepti", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Ne indikiĝis tipo de la objekto.", "Error" => "Eraro", "The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.", diff --git a/core/l10n/es.php b/core/l10n/es.php index a38050bccc2..b94e6b561da 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 2c699266c51..e079d5bcff1 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "El tipo de objeto no está especificado. ", "Error" => "Error", "The app name is not specified." => "El nombre de la App no está especificado.", diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/es_MX.php +++ b/core/l10n/es_MX.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 48fc5adcbb0..233756a8358 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ei", "Ok" => "Ok", "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekti tüüp pole määratletud.", "Error" => "Viga", "The app name is not specified." => "Rakenduse nimi ole määratletud.", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 1c11caee9e8..77a1c18167b 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Bai", "No" => "Ez", "Ok" => "Ados", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objetu mota ez dago zehaztuta.", "Error" => "Errorea", "The app name is not specified." => "App izena ez dago zehaztuta.", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index b0423577b0c..ab5d3628a07 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "بله", "No" => "نه", "Ok" => "قبول", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "نوع شی تعیین نشده است.", "Error" => "خطا", "The app name is not specified." => "نام برنامه تعیین نشده است.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index cb98a67b29d..d4a922924dc 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "Yes" => "Kyllä", "No" => "Ei", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Virhe", "The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.", "The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 8b8b7c19f2a..aac4ef99e5d 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.", "No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.", "Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.", +"No image or file provided" => "Aucune image ou fichier fourni", +"Unknown filetype" => "Type de fichier inconnu", +"Invalid image" => "Image invalide", "Sunday" => "Dimanche", "Monday" => "Lundi", "Tuesday" => "Mardi", @@ -48,9 +51,12 @@ $TRANSLATIONS = array( "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "Choose" => "Choisir", +"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}", "Yes" => "Oui", "No" => "Non", "Ok" => "Ok", +"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", "The app name is not specified." => "Le nom de l'application n'est pas spécifié.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index ec137a4e04c..5212348872e 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Non", "Ok" => "Aceptar", "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", diff --git a/core/l10n/he.php b/core/l10n/he.php index a10765c3a80..32dcde40a95 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "כן", "No" => "לא", "Ok" => "בסדר", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "סוג הפריט לא צוין.", "Error" => "שגיאה", "The app name is not specified." => "שם היישום לא צוין.", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index e69f2ffcf53..e783ec88d17 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "त्रुटि", "Share" => "साझा करें", "Share with" => "के साथ साझा", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index 97fbfb8b97f..b53301583d1 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Ne", "Ok" => "U redu", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "Error" => "Greška", "Share" => "Podijeli", "Error while sharing" => "Greška prilikom djeljenja", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 92e51d977ef..2c30fe68b7e 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Igen", "No" => "Nem", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Az objektum típusa nincs megadva.", "Error" => "Hiba", "The app name is not specified." => "Az alkalmazás neve nincs megadva.", diff --git a/core/l10n/hy.php b/core/l10n/hy.php index 9965d4731b0..d2b68819c72 100644 --- a/core/l10n/hy.php +++ b/core/l10n/hy.php @@ -22,6 +22,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ia.php b/core/l10n/ia.php index 0556d5d1295..9f530d47309 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -24,6 +24,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Error", "Share" => "Compartir", "Password" => "Contrasigno", diff --git a/core/l10n/id.php b/core/l10n/id.php index 0f222918c95..d8006280918 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Ya", "No" => "Tidak", "Ok" => "Oke", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "Tipe objek tidak ditentukan.", "Error" => "Galat", "The app name is not specified." => "Nama aplikasi tidak ditentukan.", diff --git a/core/l10n/is.php b/core/l10n/is.php index 8211421cf35..7aad8ea43ee 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "Yes" => "Já", "No" => "Nei", "Ok" => "Í lagi", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Tegund ekki tilgreind", "Error" => "Villa", "The app name is not specified." => "Nafn forrits ekki tilgreint", diff --git a/core/l10n/it.php b/core/l10n/it.php index 72fb2756d29..fa85f0ae94b 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -17,10 +17,10 @@ $TRANSLATIONS = array( "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.", "Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.", "No image or file provided" => "Non è stata fornita alcun immagine o file", -"Unknown filetype" => "Tipo file sconosciuto", +"Unknown filetype" => "Tipo di file sconosciuto", "Invalid image" => "Immagine non valida", -"No temporary profile picture available, try again" => "Nessuna foto profilo temporanea disponibile, riprova", -"No crop data provided" => "Raccolta dati non prevista", +"No temporary profile picture available, try again" => "Nessuna foto di profilo temporanea disponibile, riprova", +"No crop data provided" => "Dati di ritaglio non forniti", "Sunday" => "Domenica", "Monday" => "Lunedì", "Tuesday" => "Martedì", @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "Ok", "Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Il tipo di oggetto non è specificato.", "Error" => "Errore", "The app name is not specified." => "Il nome dell'applicazione non è specificato.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 2416f23c8e9..8c36f965599 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -57,6 +57,7 @@ $TRANSLATIONS = array( "No" => "いいえ", "Ok" => "OK", "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", "The app name is not specified." => "アプリ名がしていされていません。", diff --git a/core/l10n/ka.php b/core/l10n/ka.php index b6700f00f94..4805886c32c 100644 --- a/core/l10n/ka.php +++ b/core/l10n/ka.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "yesterday" => "გუშინ", "_%n day ago_::_%n days ago_" => array(""), "_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Password" => "პაროლი", "Personal" => "პერსონა", "Users" => "მომხმარებლები", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 15cacc8b218..42af86b2327 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "კი", "No" => "არა", "Ok" => "დიახ", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.", "Error" => "შეცდომა", "The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.", diff --git a/core/l10n/km.php b/core/l10n/km.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/km.php +++ b/core/l10n/km.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/kn.php b/core/l10n/kn.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/kn.php +++ b/core/l10n/kn.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 0265f38dc07..3c0ca5f4ff5 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "예", "No" => "아니요", "Ok" => "승락", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "객체 유형이 지정되지 않았습니다.", "Error" => "오류", "The app name is not specified." => "앱 이름이 지정되지 않았습니다.", diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php index 5ce6ce9c821..2feb6db2723 100644 --- a/core/l10n/ku_IQ.php +++ b/core/l10n/ku_IQ.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "هه‌ڵه", "Share" => "هاوبەشی کردن", "Password" => "وشەی تێپەربو", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 6a0b41b6679..c82f88d66de 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jo", "No" => "Nee", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Den Typ vum Object ass net uginn.", "Error" => "Feeler", "The app name is not specified." => "Den Numm vun der App ass net uginn.", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 1fbcf891064..630d66ce679 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Gerai", "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", "The app name is not specified." => "Nenurodytas programos pavadinimas.", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 465a497e880..48bb7b5381d 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jā", "No" => "Nē", "Ok" => "Labi", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nav norādīts objekta tips.", "Error" => "Kļūda", "The app name is not specified." => "Nav norādīts lietotnes nosaukums.", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 6a8ec50061c..4caabfa7efd 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "Во ред", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Не е специфициран типот на објект.", "Error" => "Грешка", "The app name is not specified." => "Името на апликацијата не е специфицирано.", diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/ml_IN.php +++ b/core/l10n/ml_IN.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index fc3698d58d1..f6517f9e513 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "Yes" => "Ya", "No" => "Tidak", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "Ralat", "Share" => "Kongsi", "Password" => "Kata laluan", diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php index 1016ec5f512..672067508fd 100644 --- a/core/l10n/my_MM.php +++ b/core/l10n/my_MM.php @@ -28,6 +28,7 @@ $TRANSLATIONS = array( "Yes" => "ဟုတ်", "No" => "မဟုတ်ဘူး", "Ok" => "အိုကေ", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Password" => "စကားဝှက်", "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်", "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 132b65daab2..5e08668feb4 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -40,6 +40,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nei", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Feil", "Shared" => "Delt", "Share" => "Del", diff --git a/core/l10n/ne.php b/core/l10n/ne.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/ne.php +++ b/core/l10n/ne.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/nl.php b/core/l10n/nl.php index be0b93f33cc..a7e9cc53012 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nee", "Ok" => "Ok", "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Het object type is niet gespecificeerd.", "Error" => "Fout", "The app name is not specified." => "De app naam is niet gespecificeerd.", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 86c46471a14..3b6566f40af 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nei", "Ok" => "Greitt", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Error" => "Feil", "The app name is not specified." => "Programnamnet er ikkje spesifisert.", diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/nqo.php +++ b/core/l10n/nqo.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/oc.php b/core/l10n/oc.php index 0ca3cc427a0..2de644e00ae 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -38,6 +38,7 @@ $TRANSLATIONS = array( "Yes" => "Òc", "No" => "Non", "Ok" => "D'accòrdi", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Error", "Share" => "Parteja", "Error while sharing" => "Error al partejar", diff --git a/core/l10n/pa.php b/core/l10n/pa.php index d51c26da8e1..5fc13bd1f77 100644 --- a/core/l10n/pa.php +++ b/core/l10n/pa.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "Yes" => "ਹਾਂ", "No" => "ਨਹੀਂ", "Ok" => "ਠੀਕ ਹੈ", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "ਗਲ", "Share" => "ਸਾਂਝਾ ਕਰੋ", "Password" => "ਪਾਸਵਰ", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index deb4b4c81c8..dc6e8d365b8 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Tak", "No" => "Nie", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nie określono typu obiektu.", "Error" => "Błąd", "The app name is not specified." => "Nie określono nazwy aplikacji.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index b25927ef237..5f22193d0d5 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Não", "Ok" => "Ok", "Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "O tipo de objeto não foi especificado.", "Error" => "Erro", "The app name is not specified." => "O nome do app não foi especificado.", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 4554b64d405..f2dcf4ffd38 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -16,6 +16,10 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Erro a adicionar %s aos favoritos", "No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.", "Error removing %s from favorites." => "Erro a remover %s dos favoritos.", +"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar", +"Unknown filetype" => "Ficheiro desconhecido", +"Invalid image" => "Imagem inválida", +"No temporary profile picture available, try again" => "Foto temporária de perfil indisponível, tente novamente", "Sunday" => "Domingo", "Monday" => "Segunda", "Tuesday" => "Terça", @@ -51,6 +55,8 @@ $TRANSLATIONS = array( "Yes" => "Sim", "No" => "Não", "Ok" => "Ok", +"Error loading message template: {error}" => "Erro ao carregar o template: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "O tipo de objecto não foi especificado", "Error" => "Erro", "The app name is not specified." => "O nome da aplicação não foi especificado", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 8b274cb1409..5b0f5e6538d 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Nu", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Tipul obiectului nu este specificat.", "Error" => "Eroare", "The app name is not specified." => "Numele aplicației nu este specificat.", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 0fe2e860917..973f5f38bb7 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s поделился »%s« с вами", "group" => "группа", +"Updated database" => "База данных обновлена", +"Updating filecache, this may take really long..." => "Обновление файлового кэша, это может занять некоторое время...", +"Updated filecache" => "Обновлен файловый кэш", "Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: %s" => "Эта категория уже существует: %s", @@ -10,6 +13,8 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Ошибка добавления %s в избранное", "No categories selected for deletion." => "Нет категорий для удаления.", "Error removing %s from favorites." => "Ошибка удаления %s из избранного", +"Unknown filetype" => "Неизвестный тип файла", +"Invalid image" => "Изображение повреждено", "Sunday" => "Воскресенье", "Monday" => "Понедельник", "Tuesday" => "Вторник", @@ -45,6 +50,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Нет", "Ok" => "Ок", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Тип объекта не указан", "Error" => "Ошибка", "The app name is not specified." => "Имя приложения не указано", @@ -118,8 +124,8 @@ $TRANSLATIONS = array( "Data folder" => "Директория с данными", "Configure the database" => "Настройка базы данных", "will be used" => "будет использовано", -"Database user" => "Имя пользователя для базы данных", -"Database password" => "Пароль для базы данных", +"Database user" => "Пользователь базы данных", +"Database password" => "Пароль базы данных", "Database name" => "Название базы данных", "Database tablespace" => "Табличое пространство базы данных", "Database host" => "Хост базы данных", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 184566b5f1c..6752352e344 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "Yes" => "ඔව්", "No" => "එපා", "Ok" => "හරි", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "දෝෂයක්", "Share" => "බෙදා හදා ගන්න", "Share with" => "බෙදාගන්න", diff --git a/core/l10n/sk.php b/core/l10n/sk.php index 7285020288b..50c3ecaf664 100644 --- a/core/l10n/sk.php +++ b/core/l10n/sk.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), "_%n day ago_::_%n days ago_" => array("","",""), -"_%n month ago_::_%n months ago_" => array("","","") +"_%n month ago_::_%n months ago_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","","") ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index f36445950a1..55451d45362 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Áno", "No" => "Nie", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nešpecifikovaný typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Nešpecifikované meno aplikácie.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index e88b7a6fb5a..71a653dc627 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Ne", "Ok" => "V redu", +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", "The app name is not specified." => "Ime programa ni podano.", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index c8462573ffa..a3c9e5ed6e9 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Po", "No" => "Jo", "Ok" => "Në rregull", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Nuk është specifikuar tipi i objektit.", "Error" => "Veprim i gabuar", "The app name is not specified." => "Nuk është specifikuar emri i app-it.", diff --git a/core/l10n/sr.php b/core/l10n/sr.php index 89c13c49254..fcf01301c71 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "У реду", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Врста објекта није подешена.", "Error" => "Грешка", "The app name is not specified." => "Име програма није унето.", diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index 62ed061ca06..756fdae939f 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -1,5 +1,13 @@ "Tip kategorije nije zadan.", +"No category to add?" => "Bez dodavanja kategorije?", +"This category already exists: %s" => "Kategorija već postoji: %s", +"Object type not provided." => "Tip objekta nije zadan.", +"%s ID not provided." => "%s ID nije zadan.", +"Error adding %s to favorites." => "Greška u dodavanju %s u omiljeno.", +"No categories selected for deletion." => "Kategorije za brisanje nisu izabrane.", +"Error removing %s from favorites." => "Greška u uklanjanju %s iz omiljeno.", "Sunday" => "Nedelja", "Monday" => "Ponedeljak", "Tuesday" => "Utorak", @@ -20,15 +28,65 @@ $TRANSLATIONS = array( "November" => "Novembar", "December" => "Decembar", "Settings" => "Podešavanja", +"seconds ago" => "Pre par sekundi", "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), +"today" => "Danas", +"yesterday" => "juče", "_%n day ago_::_%n days ago_" => array("","",""), +"last month" => "prošlog meseca", "_%n month ago_::_%n months ago_" => array("","",""), +"months ago" => "pre nekoliko meseci", +"last year" => "prošle godine", +"years ago" => "pre nekoliko godina", +"Choose" => "Izaberi", +"Yes" => "Da", +"No" => "Ne", +"Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"The object type is not specified." => "Tip objekta nije zadan.", +"Error" => "Greška", +"The app name is not specified." => "Ime aplikacije nije precizirano.", +"The required file {file} is not installed!" => "Potreban fajl {file} nije instaliran!", +"Shared" => "Deljeno", +"Share" => "Podeli", +"Error while sharing" => "Greška pri deljenju", +"Error while unsharing" => "Greška u uklanjanju deljenja", +"Error while changing permissions" => "Greška u promeni dozvola", +"Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ", +"Shared with you by {owner}" => "Sa vama podelio {owner}", +"Share with" => "Podeli sa", +"Share with link" => "Podeli koristei link", +"Password protect" => "Zaštita lozinkom", "Password" => "Lozinka", +"Email link to person" => "Pošalji link e-mailom", +"Send" => "Pošalji", +"Set expiration date" => "Datum isteka", +"Expiration date" => "Datum isteka", +"Share via email:" => "Deli putem e-maila", +"No people found" => "Nema pronađenih ljudi", +"Resharing is not allowed" => "Dalje deljenje nije dozvoljeno", +"Shared in {item} with {user}" => "Deljeno u {item} sa {user}", +"Unshare" => "Ukljoni deljenje", +"can edit" => "dozvoljene izmene", +"access control" => "kontrola pristupa", +"create" => "napravi", +"update" => "ažuriranje", +"delete" => "brisanje", +"share" => "deljenje", +"Password protected" => "Zaštćeno lozinkom", +"Error unsetting expiration date" => "Greška u uklanjanju datuma isteka", +"Error setting expiration date" => "Greška u postavljanju datuma isteka", +"Sending ..." => "Slanje...", +"Email sent" => "Email poslat", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Ažuriranje nije uspelo. Molimo obavestite ownCloud zajednicu.", +"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.", +"Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}", "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.", "Username" => "Korisničko ime", "Request reset" => "Zahtevaj resetovanje", "Your password was reset" => "Vaša lozinka je resetovana", +"To login page" => "Na login stranicu", "New password" => "Nova lozinka", "Reset password" => "Resetuj lozinku", "Personal" => "Lično", @@ -36,18 +94,28 @@ $TRANSLATIONS = array( "Apps" => "Programi", "Admin" => "Adninistracija", "Help" => "Pomoć", +"Access forbidden" => "Pristup zabranjen", "Cloud not found" => "Oblak nije nađen", +"Edit categories" => "Izmena kategorija", +"Add" => "Dodaj", +"Security Warning" => "Bezbednosno upozorenje", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nije dostupan generator slučajnog broja, molimo omogućite PHP OpenSSL ekstenziju.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.", "Create an admin account" => "Napravi administrativni nalog", "Advanced" => "Napredno", -"Data folder" => "Facikla podataka", +"Data folder" => "Fascikla podataka", "Configure the database" => "Podešavanje baze", "will be used" => "će biti korišćen", "Database user" => "Korisnik baze", "Database password" => "Lozinka baze", "Database name" => "Ime baze", +"Database tablespace" => "tablespace baze", "Database host" => "Domaćin baze", "Finish setup" => "Završi podešavanje", "Log out" => "Odjava", +"Automatic logon rejected!" => "Automatsko logovanje odbijeno!", "Lost your password?" => "Izgubili ste lozinku?", "remember" => "upamti" ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index b358fdc8a97..6d7cfa2dfcb 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nej", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen är inte specificerad.", "Error" => "Fel", "The app name is not specified." => " Namnet på appen är inte specificerad.", diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/sw_KE.php +++ b/core/l10n/sw_KE.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index a1a286275eb..4dcb6188180 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "ஆம்", "No" => "இல்லை", "Ok" => "சரி", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.", "Error" => "வழு", "The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.", diff --git a/core/l10n/te.php b/core/l10n/te.php index 2e2bb8f8fe8..880c29bc2a1 100644 --- a/core/l10n/te.php +++ b/core/l10n/te.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "Yes" => "అవును", "No" => "కాదు", "Ok" => "సరే", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "పొరపాటు", "Password" => "సంకేతపదం", "Send" => "పంపించు", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 90fec245c95..1069ce9d8c5 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "ตกลง", "No" => "ไม่ตกลง", "Ok" => "ตกลง", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Error" => "ข้อผิดพลาด", "The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index a4c80638d82..b3777e94bdc 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Evet", "No" => "Hayır", "Ok" => "Tamam", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Nesne türü belirtilmemiş.", "Error" => "Hata", "The app name is not specified." => "uygulama adı belirtilmedi.", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index e77718233de..6298df31354 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "Yes" => "ھەئە", "No" => "ياق", "Ok" => "جەزملە", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "خاتالىق", "Share" => "ھەمبەھىر", "Share with" => "ھەمبەھىر", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 8e74855dd08..71b1c8ba26e 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Так", "No" => "Ні", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Не визначено тип об'єкту.", "Error" => "Помилка", "The app name is not specified." => "Не визначено ім'я програми.", diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php index 96871a54d0b..5bb9255fe52 100644 --- a/core/l10n/ur_PK.php +++ b/core/l10n/ur_PK.php @@ -23,6 +23,7 @@ $TRANSLATIONS = array( "Yes" => "ہاں", "No" => "نہیں", "Ok" => "اوکے", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "ایرر", "Error while sharing" => "شئیرنگ کے دوران ایرر", "Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 1ccf03c0aaa..91f756e2663 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Có", "No" => "Không", "Ok" => "Đồng ý", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "Loại đối tượng không được chỉ định.", "Error" => "Lỗi", "The app name is not specified." => "Tên ứng dụng không được chỉ định.", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index ce61618111a..471aa735c48 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "是", "No" => "否", "Ok" => "好", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "未指定对象类型。", "Error" => "错误", "The app name is not specified." => "未指定应用名称。", diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index 8bfa1f58616..f8e9cc21762 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -31,6 +31,7 @@ $TRANSLATIONS = array( "Yes" => "Yes", "No" => "No", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "錯誤", "Shared" => "已分享", "Share" => "分享", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index a6e2588e0d7..0a9a9db7331 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "是", "No" => "否", "Ok" => "好", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "未指定物件類型。", "Error" => "錯誤", "The app name is not specified." => "沒有指定 app 名稱。", diff --git a/l10n/ach/core.po b/l10n/ach/core.po index f61d3994eea..070293766e8 100644 --- a/l10n/ach/core.po +++ b/l10n/ach/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ach/files.po b/l10n/ach/files.po index 1edc94cfa5f..b8a81660f4d 100644 --- a/l10n/ach/files.po +++ b/l10n/ach/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index 583ddc75694..591268ad387 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index 67360d8c107..ba46eb4cfa6 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "Instellings" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po index e02365d6370..1a0f6c3fbf7 100644 --- a/l10n/af_ZA/files.po +++ b/l10n/af_ZA/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index ee1052086e9..1a474f8b038 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 362057faca7..fd75a547f8b 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,11 +190,11 @@ msgstr "كانون الاول" msgid "Settings" msgstr "إعدادات" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "منذ ثواني" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -204,7 +204,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -214,15 +214,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "اليوم" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "يوم أمس" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -232,11 +232,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "الشهر الماضي" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -246,15 +246,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "شهر مضى" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "السنةالماضية" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "سنة مضت" @@ -282,6 +282,50 @@ msgstr "موافق" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 565d98c14c1..5e431360f96 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: ibrahim_9090 \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "خطأ في الكتابة على القرص الصلب" msgid "Not enough storage available" msgstr "لا يوجد مساحة تخزينية كافية" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "عملية الرفع فشلت" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "مسار غير صحيح." @@ -87,76 +91,80 @@ msgstr "مسار غير صحيح." msgid "Files" msgstr "الملفات" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "لا توجد مساحة كافية" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "تم إلغاء عملية رفع الملفات ." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "عنوان ال URL لا يجوز أن يكون فارغا." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خطأ" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "شارك" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "حذف بشكل دائم" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "إعادة تسميه" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "قيد الانتظار" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} موجود مسبقا" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "استبدال" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "اقترح إسم" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "إلغاء" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "استبدل {new_name} بـ {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "تراجع" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -166,7 +174,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -176,11 +184,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} و {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -190,53 +198,53 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "يتم تحميل الملفات" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "\".\" اسم ملف غير صحيح." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "اسم الملف لا يجوز أن يكون فارغا" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "مساحتك التخزينية امتلأت تقريبا " -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "اسم" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "حجم" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "معدل" @@ -245,7 +253,7 @@ msgstr "معدل" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "رفع" @@ -281,65 +289,65 @@ msgstr "الحد الأقصى المسموح به لملفات ZIP" msgid "Save" msgstr "حفظ" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "جديد" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ملف" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "مجلد" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "من رابط" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "حذف الملفات" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "إلغاء رفع الملفات" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "لا تملك صلاحيات الكتابة هنا." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "تحميل" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "إلغاء مشاركة" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "إلغاء" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "حجم الترفيع أعلى من المسموح" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "يرجى الانتظار , جاري فحص الملفات ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "الفحص الحالي" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index d047380c94d..42761603ac6 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/be/core.po b/l10n/be/core.po index 7e415d6b9d2..9b8d51d2575 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -190,11 +190,11 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -202,7 +202,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -210,15 +210,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -226,11 +226,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -238,15 +238,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -274,6 +274,48 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/be/files.po b/l10n/be/files.po index ef6881506f8..ebc97c0f97e 100644 --- a/l10n/be/files.po +++ b/l10n/be/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,76 +90,80 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -163,7 +171,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -171,11 +179,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -183,53 +191,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -238,7 +246,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -274,65 +282,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 211f77281ba..28e5d3884cb 100644 --- a/l10n/be/settings.po +++ b/l10n/be/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index fa51807332d..4237a779982 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Декември" msgid "Settings" msgstr "Настройки" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "преди секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "днес" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "последният месец" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "последната година" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "последните години" @@ -266,6 +266,46 @@ msgstr "Добре" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 69c221b386c..58667fa74a8 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Възникна проблем при запис в диска" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Качването е неуспешно" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Невалидна директория." @@ -86,144 +90,148 @@ msgstr "Невалидна директория." msgid "Files" msgstr "Файлове" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Качването е спряно." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Споделяне" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Изтриване завинаги" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименуване" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Чакащо" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "препокриване" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "отказ" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "възтановяване" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Размер" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Променено" @@ -232,7 +240,7 @@ msgstr "Променено" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Качване" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Запис" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ново" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстов файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Спри качването" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Няма нищо тук. Качете нещо." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Изтегляне" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Изтриване" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файлът който сте избрали за качване е прекалено голям" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Файловете се претърсват, изчакайте." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index 24ca5a353c2..215c0067174 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index d42a8ce0459..9c545be3823 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "ডিসেম্বর" msgid "Settings" msgstr "নিয়ামকসমূহ" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "সেকেন্ড পূর্বে" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "আজ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "গতকাল" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "গত মাস" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "মাস পূর্বে" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "গত বছর" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "বছর পূর্বে" @@ -266,6 +266,46 @@ msgstr "তথাস্তু" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index e2785070c36..10ce6739f11 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "ডিস্কে লিখতে ব্যর্থ" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "ভুল ডিরেক্টরি" @@ -86,144 +90,148 @@ msgstr "ভুল ডিরেক্টরি" msgid "Files" msgstr "ফাইল" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "যথেষ্ঠ পরিমাণ স্থান নেই" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "আপলোড বাতিল করা হয়েছে।" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ফাঁকা রাখা যাবে না।" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "সমস্যা" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ভাগাভাগি কর" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "পূনঃনামকরণ" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "মুলতুবি" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} টি বিদ্যমান" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "প্রতিস্থাপন" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "নাম সুপারিশ করুন" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "বাতিল" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ক্রিয়া প্রত্যাহার" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "টি একটি অননুমোদিত নাম।" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "রাম" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "আকার" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "পরিবর্তিত" @@ -232,7 +240,7 @@ msgstr "পরিবর্তিত" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "আপলোড" @@ -268,65 +276,65 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ msgid "Save" msgstr "সংরক্ষণ" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "নতুন" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "টেক্সট ফাইল" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "ফোল্ডার" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr " লিংক থেকে" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "আপলোড বাতিল কর" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ডাউনলোড" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ভাগাভাগি বাতিল " -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "মুছে" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "আপলোডের আকারটি অনেক বড়" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন " -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "বর্তমান স্ক্যানিং" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index e40fc9e7161..b36011a8a59 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bs/core.po b/l10n/bs/core.po index b8e1e43613a..5b4df12a3c8 100644 --- a/l10n/bs/core.po +++ b/l10n/bs/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -190,59 +190,59 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -270,6 +270,47 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/bs/files.po b/l10n/bs/files.po index 6c304b92899..f825923a72b 100644 --- a/l10n/bs/files.po +++ b/l10n/bs/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Podijeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -235,7 +243,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "Spasi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Fasikla" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index 00340035350..87fe921d452 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6295fd0d36a..b9bcb7573d3 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:31+0000\n" -"Last-Translator: rogerc\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Desembre" msgid "Settings" msgstr "Configuració" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segons enrere" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fa %n minut" msgstr[1] "fa %n minuts" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fa %n hora" msgstr[1] "fa %n hores" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "avui" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ahir" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fa %n dies" msgstr[1] "fa %n dies" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes passat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fa %n mes" msgstr[1] "fa %n mesos" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesos enrere" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "l'any passat" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anys enrere" @@ -268,6 +268,46 @@ msgstr "D'acord" msgid "Error loading message template: {error}" msgstr "Error en carregar la plantilla de missatge: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ca/files.po b/l10n/ca/files.po index ca6a5240892..173aeb30aca 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: rogerc\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Ha fallat en escriure al disc" msgid "Not enough storage available" msgstr "No hi ha prou espai disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "La pujada ha fallat" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directori no vàlid." @@ -88,144 +92,148 @@ msgstr "Directori no vàlid." msgid "Files" msgstr "Fitxers" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hi ha prou espai disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La pujada s'ha cancel·lat." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no pot ser buida" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Comparteix" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Esborra permanentment" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Reanomena" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendent" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ja existeix" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substitueix" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugereix un nom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancel·la" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "s'ha substituït {old_name} per {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfés" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n carpeta" msgstr[1] "%n carpetes" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fitxer" msgstr[1] "%n fitxers" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} i {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Pujant %n fitxer" msgstr[1] "Pujant %n fitxers" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fitxers pujant" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' és un nom no vàlid per un fitxer." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nom del fitxer no pot ser buit." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Mida" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -234,7 +242,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "%s no es pot canviar el nom" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Puja" @@ -270,65 +278,65 @@ msgstr "Mida màxima d'entrada per fitxers ZIP" msgid "Save" msgstr "Desa" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nou" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fitxer de text" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Des d'enllaç" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Fitxers esborrats" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancel·la la pujada" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No teniu permisos d'escriptura aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Res per aquí. Pugeu alguna cosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Baixa" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixa de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Esborra" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "La pujada és massa gran" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "S'estan escanejant els fitxers, espereu" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Actualment escanejant" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 27282ac4a97..0aafc8549f8 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 9f985c26dfc..038c8c297c0 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 18:20+0000\n" -"Last-Translator: pstast \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -195,59 +195,59 @@ msgstr "Prosinec" msgid "Settings" msgstr "Nastavení" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "před %n minutou" msgstr[1] "před %n minutami" msgstr[2] "před %n minutami" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "před %n hodinou" msgstr[1] "před %n hodinami" msgstr[2] "před %n hodinami" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "dnes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včera" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "před %n dnem" msgstr[1] "před %n dny" msgstr[2] "před %n dny" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "minulý měsíc" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "před %n měsícem" msgstr[1] "před %n měsíci" msgstr[2] "před %n měsíci" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "před měsíci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "minulý rok" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "před lety" @@ -275,6 +275,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Chyba při nahrávání šablony zprávy: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 92e790b8785..7ce4b330521 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pstast \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Zápis na disk selhal" msgid "Not enough storage available" msgstr "Nedostatek dostupného úložného prostoru" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Odesílání selhalo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neplatný adresář" @@ -90,147 +94,151 @@ msgstr "Neplatný adresář" msgid "Files" msgstr "Soubory" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nedostatek volného místa" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Odesílání zrušeno." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nemůže být prázdná." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Chyba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Sdílet" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Trvale odstranit" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Přejmenovat" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Nevyřízené" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} již existuje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "nahradit" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "navrhnout název" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "zrušit" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "nahrazeno {new_name} s {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrátit zpět" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n složka" msgstr[1] "%n složky" msgstr[2] "%n složek" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n soubor" msgstr[1] "%n soubory" msgstr[2] "%n souborů" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} a {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávám %n soubor" msgstr[1] "Nahrávám %n soubory" msgstr[2] "Nahrávám %n souborů" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "soubory se odesílají" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neplatným názvem souboru." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Název souboru nemůže být prázdný řetězec." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Název" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Velikost" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Upraveno" @@ -239,7 +247,7 @@ msgstr "Upraveno" msgid "%s could not be renamed" msgstr "%s nemůže být přejmenován" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Odeslat" @@ -275,65 +283,65 @@ msgstr "Maximální velikost vstupu pro ZIP soubory" msgid "Save" msgstr "Uložit" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nový" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textový soubor" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Složka" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odkazu" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Odstraněné soubory" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Zrušit odesílání" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nemáte zde práva zápisu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Žádný obsah. Nahrajte něco." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Stáhnout" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zrušit sdílení" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Smazat" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Odesílaný soubor je příliš velký" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Soubory se prohledávají, prosím čekejte." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktuální prohledávání" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 971650d2c96..b979460916a 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -90,36 +90,32 @@ msgstr "Nelze aktualizovat aplikaci." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Nesprávné heslo" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nebyl uveden uživatel" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Změna hesla se nezdařila" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index fbafa1ed11d..986f5a871aa 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -191,11 +191,11 @@ msgstr "Rhagfyr" msgid "Settings" msgstr "Gosodiadau" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "eiliad yn ôl" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -203,7 +203,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -211,15 +211,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "heddiw" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ddoe" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -227,11 +227,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mis diwethaf" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -239,15 +239,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "misoedd yn ôl" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "y llynedd" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "blwyddyn yn ôl" @@ -275,6 +275,48 @@ msgstr "Iawn" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index aa667889430..e2d27216bbb 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "Methwyd ysgrifennu i'r ddisg" msgid "Not enough storage available" msgstr "Dim digon o le storio ar gael" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Methwyd llwytho i fyny" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Cyfeiriadur annilys." @@ -86,76 +90,80 @@ msgstr "Cyfeiriadur annilys." msgid "Files" msgstr "Ffeiliau" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Dim digon o le ar gael" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Diddymwyd llwytho i fyny." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Does dim hawl cael URL gwag." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Gwall" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Rhannu" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Dileu'n barhaol" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Ailenwi" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "I ddod" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} yn bodoli'n barod" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "amnewid" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "awgrymu enw" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "diddymu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "newidiwyd {new_name} yn lle {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "dadwneud" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -163,7 +171,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -171,11 +179,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -183,53 +191,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ffeiliau'n llwytho i fyny" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "Mae '.' yn enw ffeil annilys." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Does dim hawl cael enw ffeil gwag." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Enw" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Maint" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Addaswyd" @@ -238,7 +246,7 @@ msgstr "Addaswyd" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Llwytho i fyny" @@ -274,65 +282,65 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP" msgid "Save" msgstr "Cadw" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Newydd" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ffeil destun" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Plygell" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Dolen o" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ffeiliau ddilewyd" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Diddymu llwytho i fyny" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nid oes gennych hawliau ysgrifennu fan hyn." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Llwytho i lawr" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dad-rannu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Dileu" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Maint llwytho i fyny'n rhy fawr" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Arhoswch, mae ffeiliau'n cael eu sganio." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Sganio cyfredol" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 93b67e8505f..6a1d7704d0f 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/da/core.po b/l10n/da/core.po index 534ae03e955..e1bdb36d528 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,55 +194,55 @@ msgstr "December" msgid "Settings" msgstr "Indstillinger" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut siden" msgstr[1] "%n minutter siden" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time siden" msgstr[1] "%n timer siden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag siden" msgstr[1] "%n dage siden" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "sidste måned" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n måned siden" msgstr[1] "%n måneder siden" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "måneder siden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "sidste år" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år siden" @@ -270,6 +270,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/da/files.po b/l10n/da/files.po index 81e48316bec..b6cf95c8d9c 100644 --- a/l10n/da/files.po +++ b/l10n/da/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: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Sappe\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Fejl ved skrivning til disk." msgid "Not enough storage available" msgstr "Der er ikke nok plads til rådlighed" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload fejlede" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -89,144 +93,148 @@ msgstr "Ugyldig mappe." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "ikke nok tilgængelig ledig plads " -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload afbrudt." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 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/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLen kan ikke være tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fejl" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slet permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Omdøb" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Afventer" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} eksisterer allerede" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "erstat" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "fortryd" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "erstattede {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "fortryd" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} og {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploader %n fil" msgstr[1] "Uploader %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "uploader filer" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er et ugyldigt filnavn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnavnet kan ikke stå tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. " -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Navn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Størrelse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Ændret" @@ -235,7 +243,7 @@ msgstr "Ændret" msgid "%s could not be renamed" msgstr "%s kunne ikke omdøbes" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP filer" msgid "Save" msgstr "Gem" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Fra link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Slettede filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikke skriverettigheder her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Fjern deling" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slet" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload er for stor" -#: templates/index.php:110 +#: templates/index.php:102 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:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 44feb2e8445..accacfac32a 100644 --- a/l10n/da/settings.po +++ b/l10n/da/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/de/core.po b/l10n/de/core.po index 46627cf2e0f..0f23d0cd3fb 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,55 +198,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -274,6 +274,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/de/files.po b/l10n/de/files.po index 3e0c024b6cb..01786015647 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +80,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -92,144 +96,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genug Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} und {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Größe" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -238,7 +246,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -274,65 +282,65 @@ msgstr "Maximale Größe für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du hast hier keine Schreib-Berechtigung." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Lade etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 312f288f6dc..4cf53d6658d 100644 --- a/l10n/de/settings.po +++ b/l10n/de/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -91,36 +91,32 @@ msgstr "Die App konnte nicht aktualisiert werden." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Falsches Passwort" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Keinen Benutzer übermittelt" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Passwort konnte nicht geändert werden" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po index 6812c21bb5a..0c8f3a25ae2 100644 --- a/l10n/de_AT/core.po +++ b/l10n/de_AT/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po index d3f9d2d4218..7c47140c843 100644 --- a/l10n/de_AT/files.po +++ b/l10n/de_AT/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index d78892f1640..c39c070ed50 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/settings.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# I Robot , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -109,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -216,7 +213,7 @@ msgstr "" #: personal.php:45 personal.php:46 msgid "__language_name__" -msgstr "" +msgstr "Deutsch (Österreich)" #: templates/admin.php:15 msgid "Security Warning" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index 827bc1f7a69..cef773ced76 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -199,55 +199,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -275,6 +275,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po index bd65b087c35..0d4817bb295 100644 --- a/l10n/de_CH/files.po +++ b/l10n/de_CH/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -83,11 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -95,144 +99,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genügend Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grösse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -241,7 +249,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -277,65 +285,65 @@ msgstr "Maximale Grösse für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Sie haben hier keine Schreib-Berechtigungen." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu gross" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index d1623c88a23..745b7eec826 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -7,6 +7,7 @@ # a.tangemann , 2013 # FlorianScholz , 2013 # FlorianScholz , 2013 +# I Robot , 2013 # kabum , 2013 # Mario Siegmann , 2013 # Mirodin , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -117,11 +118,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -224,7 +221,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" #: personal.php:45 personal.php:46 msgid "__language_name__" -msgstr "Deutsch (Förmlich: Sie)" +msgstr "Deutsch (Schweiz)" #: templates/admin.php:15 msgid "Security Warning" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index 522345b9263..a9bc9abea06 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,55 +198,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -274,6 +274,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index e236b674b77..9e4d2a24388 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,11 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -95,144 +99,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genügend Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} und {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hoch geladen" msgstr[1] "%n Dateien werden hoch geladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Größe" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -241,7 +249,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -277,65 +285,65 @@ msgstr "Maximale Größe für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Sie haben hier keine Schreib-Berechtigungen." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index bbcb8220fa1..3a889bcbca6 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -93,36 +93,32 @@ msgstr "Die App konnte nicht aktualisiert werden." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Falsches Passwort" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Keinen Benutzer übermittelt" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Passwort konnte nicht geändert werden" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/el/core.po b/l10n/el/core.po index f9d610d2032..c045d09efeb 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -197,55 +197,55 @@ msgstr "Δεκέμβριος" msgid "Settings" msgstr "Ρυθμίσεις" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "σήμερα" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "χτες" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "τελευταίο μήνα" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "μήνες πριν" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "τελευταίο χρόνο" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "χρόνια πριν" @@ -273,6 +273,46 @@ msgstr "Οκ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/el/files.po b/l10n/el/files.po index 24da73a436f..f6b7bcf82a4 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Αποτυχία εγγραφής στο δίσκο" msgid "Not enough storage available" msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Η μεταφόρτωση απέτυχε" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Μη έγκυρος φάκελος." @@ -89,144 +93,148 @@ msgstr "Μη έγκυρος φάκελος." msgid "Files" msgstr "Αρχεία" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Η αποστολή ακυρώθηκε." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Η URL δεν μπορεί να είναι κενή." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Σφάλμα" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Διαμοιρασμός" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Μόνιμη διαγραφή" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Μετονομασία" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Εκκρεμεί" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} υπάρχει ήδη" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "αντικαταστάθηκε το {new_name} με {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n φάκελος" msgstr[1] "%n φάκελοι" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n αρχείο" msgstr[1] "%n αρχεία" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Ανέβασμα %n αρχείου" msgstr[1] "Ανέβασμα %n αρχείων" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "αρχεία ανεβαίνουν" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' είναι μη έγκυρο όνομα αρχείου." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Το όνομα αρχείου δεν μπορεί να είναι κενό." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Όνομα" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Μέγεθος" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Τροποποιήθηκε" @@ -235,7 +243,7 @@ msgstr "Τροποποιήθηκε" msgid "%s could not be renamed" msgstr "Αδυναμία μετονομασίας του %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Μεταφόρτωση" @@ -271,65 +279,65 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP" msgid "Save" msgstr "Αποθήκευση" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Νέο" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Αρχείο κειμένου" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Φάκελος" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Από σύνδεσμο" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Διαγραμμένα αρχεία" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Ακύρωση αποστολής" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Λήψη" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Σταμάτημα διαμοιρασμού" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Διαγραφή" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Πολύ μεγάλο αρχείο προς αποστολή" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Τρέχουσα ανίχνευση" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 7b975e813ed..1e84a673d35 100644 --- a/l10n/el/settings.po +++ b/l10n/el/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -115,11 +115,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index 14e0eb573ca..8f786dfe211 100644 --- a/l10n/en@pirate/core.po +++ b/l10n/en@pirate/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po index 5874adaf38d..ea57ff8382a 100644 --- a/l10n/en@pirate/files.po +++ b/l10n/en@pirate/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 34070d5228f..df5539ce0c6 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index e6d3d657379..7e5c1ed0791 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 13:30+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,55 +191,55 @@ msgstr "December" msgid "Settings" msgstr "Settings" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "today" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "yesterday" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "last month" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "months ago" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "last year" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "years ago" @@ -267,6 +267,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Error loading message template: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." @@ -449,7 +489,7 @@ msgstr "Request failed!
      Did you make sure your email/username was correct?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." -msgstr "You will receive a link to reset your password via Email." +msgstr "You will receive a link to reset your password via email." #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 #: templates/login.php:19 diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po index ee07f5bbe41..fe7922ffe9a 100644 --- a/l10n/en_GB/files.po +++ b/l10n/en_GB/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "Failed to write to disk" msgid "Not enough storage available" msgstr "Not enough storage available" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Invalid directory." @@ -87,144 +91,148 @@ msgstr "Invalid directory." msgid "Files" msgstr "Files" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Not enough space available" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload cancelled." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File upload is in progress. Leaving the page now will cancel the upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL cannot be empty." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Share" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Delete permanently" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Rename" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pending" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} already exists" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "replace" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suggest name" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancel" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "replaced {new_name} with {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "undo" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n folder" msgstr[1] "%n folders" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n files" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} and {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploading %n file" msgstr[1] "Uploading %n files" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "files uploading" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' is an invalid file name." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "File name cannot be empty." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Your storage is full, files can not be updated or synced anymore!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Your storage is almost full ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Size" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modified" @@ -233,7 +241,7 @@ msgstr "Modified" msgid "%s could not be renamed" msgstr "%s could not be renamed" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -269,65 +277,65 @@ msgstr "Maximum input size for ZIP files" msgid "Save" msgstr "Save" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "New" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Text file" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "From link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Deleted files" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancel upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "You don’t have write permission here." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nothing in here. Upload something!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Unshare" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Delete" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload too large" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Files are being scanned, please wait." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Current scanning" diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po index fc51da0a011..6190c958520 100644 --- a/l10n/en_GB/files_external.po +++ b/l10n/en_GB/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:45+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po index 99cac4331f6..a0f4b32037f 100644 --- a/l10n/en_GB/files_sharing.po +++ b/l10n/en_GB/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:01+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:46+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po index ae821adafa1..6b87c1ddd49 100644 --- a/l10n/en_GB/files_trashbin.po +++ b/l10n/en_GB/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:48+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -44,24 +44,24 @@ msgstr "delete file permanently" msgid "Delete permanently" msgstr "Delete permanently" -#: js/trash.js:184 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Name" -#: js/trash.js:185 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "Deleted" -#: js/trash.js:193 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" +msgstr[0] "%n folder" msgstr[1] "%n folders" -#: js/trash.js:199 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" +msgstr[0] "%n file" msgstr[1] "%n files" #: lib/trash.php:814 lib/trash.php:816 @@ -72,11 +72,11 @@ msgstr "restored" msgid "Nothing in here. Your trash bin is empty!" msgstr "Nothing in here. Your recycle bin is empty!" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "Restore" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Delete" diff --git a/l10n/en_GB/files_versions.po b/l10n/en_GB/files_versions.po index e727185fa79..cc791b517d3 100644 --- a/l10n/en_GB/files_versions.po +++ b/l10n/en_GB/files_versions.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:49+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index 27be15c7521..bcc1f4f64a0 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -87,36 +87,32 @@ msgstr "Couldn't update app." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Incorrect password" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "No user supplied" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Please provide an admin recovery password, otherwise all user data will be lost" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Incorrect admin recovery password. Please check the password and try again." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Back-end doesn't support password change, but the user's encryption key was successfully updated." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Unable to change password" #: js/apps.js:43 msgid "Update to {appversion}" @@ -255,7 +251,7 @@ msgstr "Module 'fileinfo' missing" msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." +msgstr "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection." #: templates/admin.php:58 msgid "Locale not working" @@ -393,7 +389,7 @@ msgid "" "licensed under the AGPL." -msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." +msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." #: templates/apps.php:13 msgid "Add your App" diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po index 210787a40fa..7688c63036a 100644 --- a/l10n/en_GB/user_webdavauth.po +++ b/l10n/en_GB/user_webdavauth.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 16:40+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:43+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index b3f65dc4fbc..8c3e0433831 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Decembro" msgid "Settings" msgstr "Agordo" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundoj antaŭe" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hodiaŭ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hieraŭ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "lastamonate" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "monatoj antaŭe" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "lastajare" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "jaroj antaŭe" @@ -268,6 +268,46 @@ msgstr "Akcepti" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 74589468882..0f9a143e22a 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Malsukcesis skribo al disko" msgid "Not enough storage available" msgstr "Ne haveblas sufiĉa memoro" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Alŝuto malsukcesis" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Nevalida dosierujo." @@ -87,144 +91,148 @@ msgstr "Nevalida dosierujo." msgid "Files" msgstr "Dosieroj" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ne haveblas sufiĉa spaco" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La alŝuto nuliĝis." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ne povas esti malplena." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Eraro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Kunhavigi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Forigi por ĉiam" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Alinomigi" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Traktotaj" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jam ekzistas" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "anstataŭigi" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugesti nomon" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "nuligi" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "anstataŭiĝis {new_name} per {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "malfari" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "dosieroj estas alŝutataj" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ne estas valida dosiernomo." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Dosiernomo devas ne malpleni." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nomo" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grando" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifita" @@ -233,7 +241,7 @@ msgstr "Modifita" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Alŝuti" @@ -269,65 +277,65 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj" msgid "Save" msgstr "Konservi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nova" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstodosiero" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosierujo" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "El ligilo" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Forigitaj dosieroj" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Nuligi alŝuton" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Vi ne havas permeson skribi ĉi tie." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nenio estas ĉi tie. Alŝutu ion!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Elŝuti" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Malkunhavigi" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Forigi" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Alŝuto tro larĝa" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dosieroj estas skanataj, bonvolu atendi." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Nuna skano" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index f773f8e97ae..d049887b7b2 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/es/core.po b/l10n/es/core.po index 8b73e83c205..1e83ffd6681 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -200,55 +200,55 @@ msgstr "Diciembre" msgid "Settings" msgstr "Ajustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos antes" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoy" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ayer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes pasado" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses antes" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "el año pasado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "años antes" @@ -276,6 +276,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/es/files.po b/l10n/es/files.po index e68841cb875..a4058e8958c 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-13 23:50+0000\n" -"Last-Translator: Korrosivo \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +80,15 @@ msgstr "Falló al escribir al disco" msgid "Not enough storage available" msgstr "No hay suficiente espacio disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Error en la subida" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directorio inválido." @@ -92,144 +96,148 @@ msgstr "Directorio inválido." msgid "Files" msgstr "Archivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Incapaz de subir su archivo, es un directorio o tiene 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hay suficiente espacio disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Subida cancelada." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renombrar" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendiente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "reemplazado {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "deshacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n carpetas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n archivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} y {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Subiendo %n archivo" msgstr[1] "Subiendo %n archivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "subiendo archivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' no es un nombre de archivo válido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nombre de archivo no puede estar vacío." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos " -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nombre" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -238,7 +246,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s no se pudo renombrar" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Subir" @@ -274,65 +282,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuevo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Archivo de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde enlace" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Archivos eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No tiene permisos de escritura aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "No hay nada aquí. ¡Suba algo!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Subida demasido grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Los archivos están siendo escaneados, por favor espere." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index e93338b73e9..f11743ea954 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -4,6 +4,7 @@ # # Translators: # Art O. Pal , 2013 +# asaez , 2013 # eadeprado , 2013 # ggam , 2013 # pablomillaquen , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -104,12 +105,12 @@ msgstr "" msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo." #: changepassword/controller.php:87 msgid "" @@ -117,13 +118,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "No se ha podido cambiar la contraseña" #: js/apps.js:43 msgid "Update to {appversion}" @@ -171,7 +168,7 @@ msgstr "Actualizado" #: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Seleccionar una imagen de perfil" #: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." @@ -505,15 +502,15 @@ msgstr "Foto del perfil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Subir nuevo" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Seleccionar nuevo desde Ficheros" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Borrar imagen" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -525,7 +522,7 @@ msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Seleccionar como imagen de perfil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 570b13d5cca..dd3a48b0d1e 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "diciembre" msgid "Settings" msgstr "Configuración" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoy" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ayer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes pasado" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "el año pasado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "años atrás" @@ -267,6 +267,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 68680594d18..f502ba71685 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: cnngimenez\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,15 @@ msgstr "Error al escribir en el disco" msgid "Not enough storage available" msgstr "No hay suficiente almacenamiento" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Error al subir el archivo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directorio inválido." @@ -90,144 +94,148 @@ msgstr "Directorio inválido." msgid "Files" msgstr "Archivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hay suficiente espacio disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Borrar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendientes" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "se reemplazó {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "deshacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n carpeta" msgstr[1] "%n carpetas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n archivo" msgstr[1] "%n archivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{carpetas} y {archivos}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Subiendo %n archivo" msgstr[1] "Subiendo %n archivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Subiendo archivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' es un nombre de archivo inválido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nombre del archivo no puede quedar vacío." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nombre" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -236,7 +244,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "No se pudo renombrar %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Subir" @@ -272,65 +280,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuevo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Archivo de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde enlace" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Archivos borrados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No tenés permisos de escritura acá." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "No hay nada. ¡Subí contenido!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Borrar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "El tamaño del archivo que querés subir es demasiado grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo " -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor esperá." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 512b5a949f4..faf86eb4603 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po index 9a6e9cbb095..d351beb1b75 100644 --- a/l10n/es_MX/core.po +++ b/l10n/es_MX/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po index 0e1dc47804e..7405f7a77b6 100644 --- a/l10n/es_MX/files.po +++ b/l10n/es_MX/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index c0dcfcc0d5b..7b7e92dc23d 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index eb1f23ddad0..b94690c975e 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 08:20+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,55 +192,55 @@ msgstr "Detsember" msgid "Settings" msgstr "Seaded" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundit tagasi" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut tagasi" msgstr[1] "%n minutit tagasi" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tund tagasi" msgstr[1] "%n tundi tagasi" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "täna" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "eile" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päev tagasi" msgstr[1] "%n päeva tagasi" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "viimasel kuul" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuu tagasi" msgstr[1] "%n kuud tagasi" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "kuu tagasi" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "viimasel aastal" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "aastat tagasi" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Viga sõnumi malli laadimisel: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 943c2186c0c..52bcf2de8f0 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Kettale kirjutamine ebaõnnestus" msgid "Not enough storage available" msgstr "Saadaval pole piisavalt ruumi" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Üleslaadimine ebaõnnestus" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Vigane kaust." @@ -88,144 +92,148 @@ msgstr "Vigane kaust." msgid "Files" msgstr "Failid" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Pole piisavalt ruumi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Üleslaadimine tühistati." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ei saa olla tühi." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Viga" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Jaga" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Kustuta jäädavalt" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Nimeta ümber" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ootel" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} on juba olemas" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "asenda" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "soovita nime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "loobu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "asendas nime {old_name} nimega {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "tagasi" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kataloog" msgstr[1] "%n kataloogi" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fail" msgstr[1] "%n faili" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ja {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laadin üles %n faili" msgstr[1] "Laadin üles %n faili" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "faili üleslaadimisel" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' on vigane failinimi." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Faili nimi ei saa olla tühi." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. " -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nimi" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Suurus" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Muudetud" @@ -234,7 +242,7 @@ msgstr "Muudetud" msgid "%s could not be renamed" msgstr "%s ümbernimetamine ebaõnnestus" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Lae üles" @@ -270,65 +278,65 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus" msgid "Save" msgstr "Salvesta" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Uus" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstifail" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Kaust" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Allikast" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Kustutatud failid" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Tühista üleslaadimine" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Siin puudvad sul kirjutamisõigused." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Siin pole midagi. Lae midagi üles!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lae alla" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Lõpeta jagamine" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Kustuta" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Üleslaadimine on liiga suur" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Faile skannitakse, palun oota." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Praegune skannimine" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index fce1cc2fbc0..72d666a7d0b 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -88,36 +88,32 @@ msgstr "Rakenduse uuendamine ebaõnnestus." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Vale parool" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Kasutajat ei sisestatud" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Ei suuda parooli muuta" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 6c943bef9ee..ccac1c7de4a 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Abendua" msgid "Settings" msgstr "Ezarpenak" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundu" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "orain dela minutu %n" msgstr[1] "orain dela %n minutu" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "orain dela ordu %n" msgstr[1] "orain dela %n ordu" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "gaur" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "atzo" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "orain dela egun %n" msgstr[1] "orain dela %n egun" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "joan den hilabetean" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "orain dela hilabete %n" msgstr[1] "orain dela %n hilabete" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "hilabete" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "joan den urtean" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "urte" @@ -268,6 +268,46 @@ msgstr "Ados" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/eu/files.po b/l10n/eu/files.po index d48f767a56a..46b992abc37 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Errore bat izan da diskoan idazterakoan" msgid "Not enough storage available" msgstr "Ez dago behar aina leku erabilgarri," -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "igotzeak huts egin du" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Baliogabeko karpeta." @@ -88,144 +92,148 @@ msgstr "Baliogabeko karpeta." msgid "Files" msgstr "Fitxategiak" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ez dago leku nahikorik." -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLa ezin da hutsik egon." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Errorea" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Elkarbanatu" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Ezabatu betirako" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Berrizendatu" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Zain" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} dagoeneko existitzen da" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr " {new_name}-k {old_name} ordezkatu du" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desegin" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "karpeta %n" msgstr[1] "%n karpeta" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "fitxategi %n" msgstr[1] "%n fitxategi" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Fitxategi %n igotzen" msgstr[1] "%n fitxategi igotzen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fitxategiak igotzen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ez da fitxategi izen baliogarria." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Fitxategi izena ezin da hutsa izan." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. " -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Izena" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Aldatuta" @@ -234,7 +242,7 @@ msgstr "Aldatuta" msgid "%s could not be renamed" msgstr "%s ezin da berrizendatu" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Igo" @@ -270,65 +278,65 @@ msgstr "ZIP fitxategien gehienezko tamaina" msgid "Save" msgstr "Gorde" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Berria" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Testu fitxategia" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Karpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Estekatik" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ezabatutako fitxategiak" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Ezeztatu igoera" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Ez duzu hemen idazteko baimenik." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ez dago ezer. Igo zerbait!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Deskargatu" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Ez elkarbanatu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ezabatu" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Igoera handiegia da" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Orain eskaneatzen ari da" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index fd516826967..fc5007d8579 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index c0dfd2514b8..a4e9885b054 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,51 +191,51 @@ msgstr "دسامبر" msgid "Settings" msgstr "تنظیمات" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "ثانیه‌ها پیش" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "امروز" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "دیروز" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ماه قبل" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ماه‌های قبل" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "سال قبل" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "سال‌های قبل" @@ -263,6 +263,45 @@ msgstr "قبول" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 4c7fbe5528e..b6b078cb364 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود" msgid "Not enough storage available" msgstr "فضای کافی در دسترس نیست" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "بارگزاری ناموفق بود" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "فهرست راهنما نامعتبر می باشد." @@ -87,141 +91,145 @@ msgstr "فهرست راهنما نامعتبر می باشد." msgid "Files" msgstr "پرونده‌ها" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "فضای کافی در دسترس نیست" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "بار گذاری لغو شد" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. " -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL نمی تواند خالی باشد." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خطا" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "اشتراک‌گذاری" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "حذف قطعی" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "تغییرنام" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "در انتظار" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{نام _جدید} در حال حاضر وجود دارد." -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "جایگزین" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "پیشنهاد نام" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "لغو" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد." -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "بازگشت" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "بارگذاری فایل ها" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' یک نام پرونده نامعتبر است." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "نام پرونده نمی تواند خالی باشد." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "نام" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "اندازه" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "تاریخ" @@ -230,7 +238,7 @@ msgstr "تاریخ" msgid "%s could not be renamed" msgstr "%s نمیتواند تغییر نام دهد." -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "بارگزاری" @@ -266,65 +274,65 @@ msgstr "حداکثرمقدار برای بار گزاری پرونده های ف msgid "Save" msgstr "ذخیره" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "جدید" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "فایل متنی" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "پوشه" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "از پیوند" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "فایل های حذف شده" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "متوقف کردن بار گذاری" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "شما اجازه ی نوشتن در اینجا را ندارید" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "اینجا هیچ چیز نیست." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "دانلود" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "لغو اشتراک" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "حذف" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "بازرسی کنونی" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 587c70ba4a9..7a3f31a7195 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 499d8b2d8d6..6eecad24ce9 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "joulukuu" msgid "Settings" msgstr "Asetukset" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekuntia sitten" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuutti sitten" msgstr[1] "%n minuuttia sitten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tunti sitten" msgstr[1] "%n tuntia sitten" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "tänään" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "eilen" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päivä sitten" msgstr[1] "%n päivää sitten" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "viime kuussa" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuukausi sitten" msgstr[1] "%n kuukautta sitten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "kuukautta sitten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "viime vuonna" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "vuotta sitten" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 34fe35c6ce9..cc0dfaf5c1f 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Levylle kirjoitus epäonnistui" msgid "Not enough storage available" msgstr "Tallennustilaa ei ole riittävästi käytettävissä" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Lähetys epäonnistui" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Virheellinen kansio." @@ -87,144 +91,148 @@ msgstr "Virheellinen kansio." msgid "Files" msgstr "Tiedostot" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Tilaa ei ole riittävästi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Lähetys peruttu." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Verkko-osoite ei voi olla tyhjä" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Virhe" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Jaa" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Poista pysyvästi" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Nimeä uudelleen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Odottaa" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} on jo olemassa" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "korvaa" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "ehdota nimeä" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "peru" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "kumoa" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kansio" msgstr[1] "%n kansiota" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n tiedosto" msgstr[1] "%n tiedostoa" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ja {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lähetetään %n tiedosto" msgstr[1] "Lähetetään %n tiedostoa" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' on virheellinen nimi tiedostolle." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Tiedoston nimi ei voi olla tyhjä." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nimi" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Koko" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Muokattu" @@ -233,7 +241,7 @@ msgstr "Muokattu" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Lähetä" @@ -269,65 +277,65 @@ msgstr "ZIP-tiedostojen enimmäiskoko" msgid "Save" msgstr "Tallenna" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Uusi" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstitiedosto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Kansio" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Linkistä" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Poistetut tiedostot" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Peru lähetys" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lataa" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Peru jakaminen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Poista" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Lähetettävä tiedosto on liian suuri" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Tiedostoja tarkistetaan, odota hetki." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 60eda83c46b..2b9b270367a 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -87,7 +87,7 @@ msgstr "Sovelluksen päivitys epäonnistui." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Väärä salasana" #: changepassword/controller.php:42 msgid "No user supplied" @@ -110,13 +110,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Salasanan vaihto ei onnistunut" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 7ba9214216e..011e6dbd15a 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -6,14 +6,15 @@ # Adalberto Rodrigues , 2013 # Christophe Lherieau , 2013 # msoko , 2013 +# ogre_sympathique , 2013 # plachance , 2013 # red0ne , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -97,15 +98,15 @@ msgstr "Erreur lors de la suppression de %s des favoris." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Aucune image ou fichier fourni" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Type de fichier inconnu" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Image invalide" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -195,55 +196,55 @@ msgstr "décembre" msgid "Settings" msgstr "Paramètres" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "il y a %n minute" msgstr[1] "il y a %n minutes" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Il y a %n heure" msgstr[1] "Il y a %n heures" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "aujourd'hui" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hier" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "il y a %n jour" msgstr[1] "il y a %n jours" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "le mois dernier" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Il y a %n mois" msgstr[1] "Il y a %n mois" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "il y a plusieurs mois" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "l'année dernière" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "il y a plusieurs années" @@ -253,7 +254,7 @@ msgstr "Choisir" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -269,6 +270,46 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" +msgstr "Erreur de chargement du modèle de message : {error}" + +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" msgstr "" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 diff --git a/l10n/fr/files.po b/l10n/fr/files.po index f3e3767ce8b..fcbbbad254e 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: ogre_sympathique \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Erreur d'écriture sur le disque" msgid "Not enough storage available" msgstr "Plus assez d'espace de stockage disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Échec de l'envoi" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Dossier invalide." @@ -90,144 +94,148 @@ msgstr "Dossier invalide." msgid "Files" msgstr "Fichiers" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espace disponible insuffisant" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envoi annulé." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "L'URL ne peut-être vide" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erreur" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Partager" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Supprimer de façon définitive" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renommer" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "En attente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existe déjà" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "remplacer" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Suggérer un nom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annuler" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} a été remplacé par {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "annuler" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dossier" msgstr[1] "%n dossiers" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fichier" msgstr[1] "%n fichiers" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dir} et {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Téléversement de %n fichier" msgstr[1] "Téléversement de %n fichiers" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fichiers en cours d'envoi" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' n'est pas un nom de fichier valide." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Le nom de fichier ne peut être vide." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Taille" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifié" @@ -236,7 +244,7 @@ msgstr "Modifié" msgid "%s could not be renamed" msgstr "%s ne peut être renommé" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Envoyer" @@ -272,65 +280,65 @@ msgstr "Taille maximale pour les fichiers ZIP" msgid "Save" msgstr "Sauvegarder" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nouveau" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fichier texte" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Depuis le lien" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Fichiers supprimés" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Vous n'avez pas le droit d'écriture ici." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Télécharger" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Ne plus partager" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Supprimer" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Téléversement trop volumineux" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Analyse en cours" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 547f24c0230..792ec310105 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -5,13 +5,14 @@ # Translators: # Christophe Lherieau , 2013 # Cyril Glapa , 2013 +# ogre_sympathique , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 13:10+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -57,15 +58,15 @@ msgstr "Echec de la mise à niveau \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement." #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Type de fichier inconnu" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Image invalide" #: defaults.php:35 msgid "web services under your control" @@ -166,15 +167,15 @@ msgstr "Erreur d'authentification" msgid "Token expired. Please reload page." msgstr "La session a expiré. Veuillez recharger la page." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fichiers" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Texte" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Images" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 49cfd880244..529e2e8c356 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -7,13 +7,14 @@ # Christophe Lherieau , 2013 # lyly95, 2013 # Mystyle , 2013 +# ogre_sympathique , 2013 # red0ne , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -91,11 +92,11 @@ msgstr "Impossible de mettre à jour l'application" #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Mot de passe incorrect" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Aucun utilisateur fourni" #: changepassword/controller.php:74 msgid "" @@ -114,13 +115,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossible de modifier le mot de passe" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index a4c485ede18..25a8ee333ff 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,55 +191,55 @@ msgstr "decembro" msgid "Settings" msgstr "Axustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "hai %n minuto" msgstr[1] "hai %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "hai %n hora" msgstr[1] "hai %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoxe" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "onte" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "hai %n día" msgstr[1] "hai %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "último mes" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "hai %n mes" msgstr[1] "hai %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "último ano" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -267,6 +267,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/gl/files.po b/l10n/gl/files.po index f1ef8190bbc..45a9129ab2d 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "Produciuse un erro ao escribir no disco" msgid "Not enough storage available" msgstr "Non hai espazo de almacenamento abondo" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Produciuse un fallou no envío" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "O directorio é incorrecto." @@ -87,144 +91,148 @@ msgstr "O directorio é incorrecto." msgid "Files" msgstr "Ficheiros" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "O espazo dispoñíbel é insuficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envío cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "O URL non pode quedar baleiro." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendentes" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "Xa existe un {new_name}" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituír" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suxerir nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "substituír {new_name} por {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartafol" msgstr[1] "%n cartafoles" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n ficheiro" msgstr[1] "%n ficheiros" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Cargando %n ficheiro" msgstr[1] "Cargando %n ficheiros" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ficheiros enviándose" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "«.» é un nome de ficheiro incorrecto" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome de ficheiro non pode estar baleiro" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -233,7 +241,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s non pode cambiar de nome" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Enviar" @@ -269,65 +277,65 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP" msgid "Save" msgstr "Gardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ficheiro de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Cartafol" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde a ligazón" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ficheiros eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar o envío" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Non ten permisos para escribir aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Aquí non hai nada. Envíe algo." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Envío demasiado grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Estanse analizando os ficheiros. Agarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index df5d5ec7294..8533d9c17c6 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -87,36 +87,32 @@ msgstr "Non foi posíbel actualizar o aplicativo." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Contrasinal incorrecto" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Non subministrado polo usuario" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Non é posíbel cambiar o contrasinal" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/he/core.po b/l10n/he/core.po index ecb35c7ac73..1f7da9c0253 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "דצמבר" msgid "Settings" msgstr "הגדרות" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "שניות" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "לפני %n דקה" msgstr[1] "לפני %n דקות" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "לפני %n שעה" msgstr[1] "לפני %n שעות" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "היום" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "אתמול" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "לפני %n יום" msgstr[1] "לפני %n ימים" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "חודש שעבר" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "לפני %n חודש" msgstr[1] "לפני %n חודשים" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "חודשים" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "שנה שעברה" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "שנים" @@ -268,6 +268,46 @@ msgstr "בסדר" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/he/files.po b/l10n/he/files.po index 653e107a6e2..15a0138955b 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "הכתיבה לכונן נכשלה" msgid "Not enough storage available" msgstr "אין די שטח פנוי באחסון" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ההעלאה נכשלה" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "תיקייה שגויה." @@ -87,144 +91,148 @@ msgstr "תיקייה שגויה." msgid "Files" msgstr "קבצים" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "ההעלאה בוטלה." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "קישור אינו יכול להיות ריק." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "שגיאה" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "שתף" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "מחק לצמיתות" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "שינוי שם" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "ממתין" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} כבר קיים" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "החלפה" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "הצעת שם" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ביטול" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} הוחלף ב־{old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ביטול" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "קבצים בהעלאה" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "שם" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "גודל" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "זמן שינוי" @@ -233,7 +241,7 @@ msgstr "זמן שינוי" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "העלאה" @@ -269,65 +277,65 @@ msgstr "גודל הקלט המרבי לקובצי ZIP" msgid "Save" msgstr "שמירה" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "חדש" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "קובץ טקסט" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "תיקייה" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "מקישור" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ביטול ההעלאה" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "הורדה" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "הסר שיתוף" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "מחיקה" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "העלאה גדולה מידי" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "הקבצים נסרקים, נא להמתין." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "הסריקה הנוכחית" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 275d36704f8..25d1901bcce 100644 --- a/l10n/he/settings.po +++ b/l10n/he/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 31d7caf5d3e..834b2c48eba 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 15:30+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "दिसम्बर" msgid "Settings" msgstr "सेटिंग्स" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -268,6 +268,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 1be595e8e63..f6fcb10b392 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" -"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "त्रुटि" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "साझा करें" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index f54504cd727..fc8e5837c9c 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index d8b8a3018c3..583405240bb 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Prosinac" msgid "Settings" msgstr "Postavke" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundi prije" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "danas" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "jučer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "prošli mjesec" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mjeseci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "prošlu godinu" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "godina" @@ -270,6 +270,47 @@ msgstr "U redu" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/hr/files.po b/l10n/hr/files.po index fad167ba7b8..3eab0bfde87 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Neuspjelo pisanje na disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "Datoteke" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Slanje poništeno." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Greška" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Podijeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Promjeni ime" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "U tijeku" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zamjeni" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "predloži ime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "odustani" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrati" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "datoteke se učitavaju" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Zadnja promjena" @@ -235,7 +243,7 @@ msgstr "Zadnja promjena" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Učitaj" @@ -271,65 +279,65 @@ msgstr "Maksimalna veličina za ZIP datoteke" msgid "Save" msgstr "Snimi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "tekstualna datoteka" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "mapa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Prekini upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nema ničega u ovoj mapi. Pošalji nešto!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Preuzimanje" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Makni djeljenje" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Obriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Prijenos je preobiman" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Datoteke se skeniraju, molimo pričekajte." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Trenutno skeniranje" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index db3bfe8145c..aec94bb5dfb 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 18378d4b15d..9a7ab1014f3 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "december" msgid "Settings" msgstr "Beállítások" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pár másodperce" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ma" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "tegnap" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "múlt hónapban" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "több hónapja" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "tavaly" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "több éve" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 7843881e215..51bd0806da3 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Nem sikerült a lemezre történő írás" msgid "Not enough storage available" msgstr "Nincs elég szabad hely." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "A feltöltés nem sikerült" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Érvénytelen mappa." @@ -87,144 +91,148 @@ msgstr "Érvénytelen mappa." msgid "Files" msgstr "Fájlok" -#: js/file-upload.js:11 -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/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nincs elég szabad hely" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "A feltöltést megszakítottuk." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Az URL nem lehet semmi." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Hiba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Megosztás" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Végleges törlés" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Átnevezés" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} már létezik" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "írjuk fölül" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "legyen más neve" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "mégse" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "visszavonás" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fájl töltődik föl" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' fájlnév érvénytelen." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "A fájlnév nem lehet semmi." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "A tároló majdnem tele van ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Név" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Méret" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Módosítva" @@ -233,7 +241,7 @@ msgstr "Módosítva" msgid "%s could not be renamed" msgstr "%s átnevezése nem sikerült" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Feltöltés" @@ -269,65 +277,65 @@ msgstr "ZIP-fájlok maximális kiindulási mérete" msgid "Save" msgstr "Mentés" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Új" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Szövegfájl" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Feltöltés linkről" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Törölt fájlok" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "A feltöltés megszakítása" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Itt nincs írásjoga." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Itt nincs semmi. Töltsön fel valamit!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Letöltés" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "A megosztás visszavonása" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Törlés" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "A feltöltés túl nagy" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Ellenőrzés alatt" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 7643899f6d9..7ef4a07d1ae 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hy/core.po b/l10n/hy/core.po index 3200bbb8534..cfc83cf7733 100644 --- a/l10n/hy/core.po +++ b/l10n/hy/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "Դեկտեմբեր" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/hy/files.po b/l10n/hy/files.po index 6c477202b4d..46e6544393b 100644 --- a/l10n/hy/files.po +++ b/l10n/hy/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Պահպանել" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "Բեռնել" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ջնջել" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index faf9956c067..ecc4b3e2788 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 51ad0cc856f..5a048cfc144 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configurationes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 391f76c987c..5244ffda625 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Files" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nomine" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimension" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificate" @@ -232,7 +240,7 @@ msgstr "Modificate" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Incargar" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Salveguardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nove" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "File de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nihil hic. Incarga alcun cosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Discargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Deler" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Incargamento troppo longe" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index b88c80f02cb..3097b240fc6 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/id/core.po b/l10n/id/core.po index 6330d1f9d2e..355807ff032 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "Desember" msgid "Settings" msgstr "Setelan" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hari ini" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "kemarin" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "bulan kemarin" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "beberapa bulan lalu" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "tahun kemarin" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "beberapa tahun lalu" @@ -262,6 +262,45 @@ msgstr "Oke" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/id/files.po b/l10n/id/files.po index 2ce822890c6..dc0c2272b6b 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Gagal menulis ke disk" msgid "Not enough storage available" msgstr "Ruang penyimpanan tidak mencukupi" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Direktori tidak valid." @@ -86,141 +90,145 @@ msgstr "Direktori tidak valid." msgid "Files" msgstr "Berkas" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ruang penyimpanan tidak mencukupi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL tidak boleh kosong" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Galat" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Bagikan" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Hapus secara permanen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Ubah nama" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Menunggu" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} sudah ada" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ganti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sarankan nama" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "batalkan" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "mengganti {new_name} dengan {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "urungkan" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "berkas diunggah" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' bukan nama berkas yang valid." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nama berkas tidak boleh kosong." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nama" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Ukuran" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Dimodifikasi" @@ -229,7 +237,7 @@ msgstr "Dimodifikasi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Unggah" @@ -265,65 +273,65 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP" msgid "Save" msgstr "Simpan" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Baru" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Berkas teks" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Dari tautan" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Berkas yang dihapus" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Batal pengunggahan" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Anda tidak memiliki izin menulis di sini." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Unduh" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Batalkan berbagi" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Hapus" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Yang diunggah terlalu besar" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Berkas sedang dipindai, silakan tunggu." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Yang sedang dipindai" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 260df1998ac..7f2ef31f552 100644 --- a/l10n/id/settings.po +++ b/l10n/id/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/is/core.po b/l10n/is/core.po index a9ac3082288..e4e28667bae 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Desember" msgid "Settings" msgstr "Stillingar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sek." -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "í dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "í gær" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "síðasta mánuði" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mánuðir síðan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "síðasta ári" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "einhverjum árum" @@ -267,6 +267,46 @@ msgstr "Í lagi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/is/files.po b/l10n/is/files.po index b5561e49004..e53fa55a725 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Tókst ekki að skrifa á disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ógild mappa." @@ -86,144 +90,148 @@ msgstr "Ógild mappa." msgid "Files" msgstr "Skrár" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ekki nægt pláss tiltækt" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Hætt við innsendingu." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Vefslóð má ekki vera tóm." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Villa" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Deila" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Endurskýra" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Bíður" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} er þegar til" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "yfirskrifa" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "stinga upp á nafni" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "hætta við" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "yfirskrifaði {new_name} með {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "afturkalla" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er ekki leyfilegt nafn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nafn skráar má ekki vera tómt" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nafn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Stærð" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Breytt" @@ -232,7 +240,7 @@ msgstr "Breytt" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Senda inn" @@ -268,65 +276,65 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár" msgid "Save" msgstr "Vista" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nýtt" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Texta skrá" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Af tengli" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Hætta við innsendingu" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ekkert hér. Settu eitthvað inn!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Niðurhal" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Hætta deilingu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eyða" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Innsend skrá er of stór" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Verið er að skima skrár, vinsamlegast hinkraðu." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Er að skima" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 033cdb62333..928b1480018 100644 --- a/l10n/is/settings.po +++ b/l10n/is/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/it/core.po b/l10n/it/core.po index ab95d67cc34..4189836997f 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 22:30+0000\n" -"Last-Translator: polxmod \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -99,7 +99,7 @@ msgstr "Non è stata fornita alcun immagine o file" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "Tipo file sconosciuto" +msgstr "Tipo di file sconosciuto" #: avatar/controller.php:85 msgid "Invalid image" @@ -107,11 +107,11 @@ msgstr "Immagine non valida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "Nessuna foto profilo temporanea disponibile, riprova" +msgstr "Nessuna foto di profilo temporanea disponibile, riprova" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "Raccolta dati non prevista" +msgstr "Dati di ritaglio non forniti" #: js/config.php:32 msgid "Sunday" @@ -193,55 +193,55 @@ msgstr "Dicembre" msgid "Settings" msgstr "Impostazioni" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "secondi fa" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "oggi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ieri" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mese scorso" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesi fa" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "anno scorso" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anni fa" @@ -269,6 +269,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Errore durante il caricamento del modello di messaggio: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/it/files.po b/l10n/it/files.po index b97ed259366..cde611190ef 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Scrittura su disco non riuscita" msgid "Not enough storage available" msgstr "Spazio di archiviazione insufficiente" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Caricamento non riuscito" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Cartella non valida." @@ -88,144 +92,148 @@ msgstr "Cartella non valida." msgid "Files" msgstr "File" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Spazio disponibile insufficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Invio annullato" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "L'URL non può essere vuoto." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Errore" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Condividi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Elimina definitivamente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Rinomina" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "In corso" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} esiste già" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "sostituisci" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suggerisci nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annulla" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "sostituito {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "annulla" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartella" msgstr[1] "%n cartelle" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n file" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Caricamento di %n file in corso" msgstr[1] "Caricamento di %n file in corso" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "caricamento file" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' non è un nome file valido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Il nome del file non può essere vuoto." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensione" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificato" @@ -234,7 +242,7 @@ msgstr "Modificato" msgid "%s could not be renamed" msgstr "%s non può essere rinominato" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Carica" @@ -270,65 +278,65 @@ msgstr "Dimensione massima per i file ZIP" msgid "Save" msgstr "Salva" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuovo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "File di testo" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Cartella" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Da collegamento" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "File eliminati" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Annulla invio" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Qui non hai i permessi di scrittura." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Non c'è niente qui. Carica qualcosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Scarica" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Rimuovi condivisione" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Elimina" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Caricamento troppo grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Scansione dei file in corso, attendi" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scansione corrente" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 8c5f8ced5fc..27b7c76e85e 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 22:30+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 05:50+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" @@ -58,11 +58,11 @@ msgstr "Aggiornamento non riuscito \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura." +msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura" #: avatar.php:64 msgid "Unknown filetype" -msgstr "Tipo file sconosciuto" +msgstr "Tipo di file sconosciuto" #: avatar.php:69 msgid "Invalid image" @@ -167,15 +167,15 @@ msgstr "Errore di autenticazione" msgid "Token expired. Please reload page." msgstr "Token scaduto. Ricarica la pagina." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "File" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Testo" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Immagini" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 6988cc5e5f1..0e5f28a4d15 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -90,36 +90,32 @@ msgstr "Impossibile aggiornate l'applicazione." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Password errata" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Non è stato fornito alcun utente" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi." #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Password amministrativa di ripristino errata. Controlla la password e prova ancora." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossibile cambiare la password" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index d6343899dc2..f72301efcb2 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 05:50+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,51 +194,51 @@ msgstr "12月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "数秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 時間後" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今日" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨日" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 日後" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "一月前" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n カ月後" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "一年前" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "年前" @@ -266,6 +266,45 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "メッセージテンプレートの読み込みエラー: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index bcb42ff87e3..b712c8b95a9 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/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: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: tt yn \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -79,11 +79,15 @@ msgstr "ディスクへの書き込みに失敗しました" msgid "Not enough storage available" msgstr "ストレージに十分な空き容量がありません" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "アップロードに失敗" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "無効なディレクトリです。" @@ -91,141 +95,145 @@ msgstr "無効なディレクトリです。" msgid "Files" msgstr "ファイル" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "利用可能なスペースが十分にありません" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "アップロードはキャンセルされました。" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLは空にできません。" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "エラー" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "共有" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "完全に削除する" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "名前の変更" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "中断" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} はすでに存在しています" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "置き換え" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} を {new_name} に置換" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n個のフォルダ" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n個のファイル" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} と {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個のファイルをアップロード中" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ファイルをアップロード中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' は無効なファイル名です。" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ファイル名を空にすることはできません。" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名前" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "サイズ" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "変更" @@ -234,7 +242,7 @@ msgstr "変更" msgid "%s could not be renamed" msgstr "%sの名前を変更できませんでした" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "アップロード" @@ -270,65 +278,65 @@ msgstr "ZIPファイルへの最大入力サイズ" msgid "Save" msgstr "保存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新規作成" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "テキストファイル" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "フォルダ" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "リンク" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "削除ファイル" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "アップロードをキャンセル" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "あなたには書き込み権限がありません。" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "ここには何もありません。何かアップロードしてください。" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ダウンロード" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "共有解除" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "削除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "アップロードには大きすぎます。" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ファイルをスキャンしています、しばらくお待ちください。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "スキャン中" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index cc0e31052f0..c9851b54dea 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ka/core.po b/l10n/ka/core.po index 90fa5a82e67..e6a62126ccc 100644 --- a/l10n/ka/core.po +++ b/l10n/ka/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "დღეს" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ka/files.po b/l10n/ka/files.po index 8189ecec470..84143c9cd2a 100644 --- a/l10n/ka/files.po +++ b/l10n/ka/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ფაილები" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "გადმოწერა" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po index 139784572dd..86e902ed4f4 100644 --- a/l10n/ka/settings.po +++ b/l10n/ka/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 64a9519691b..247c6892b0a 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "დეკემბერი" msgid "Settings" msgstr "პარამეტრები" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "დღეს" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "გასულ თვეში" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "თვის წინ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ბოლო წელს" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "წლის წინ" @@ -262,6 +262,45 @@ msgstr "დიახ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 56fff63712a..a9e38b7176a 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "შეცდომა დისკზე ჩაწერისას" msgid "Not enough storage available" msgstr "საცავში საკმარისი ადგილი არ არის" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ატვირთვა ვერ განხორციელდა" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "დაუშვებელი დირექტორია." @@ -86,141 +90,145 @@ msgstr "დაუშვებელი დირექტორია." msgid "Files" msgstr "ფაილები" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "საკმარისი ადგილი არ არის" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "ატვირთვა შეჩერებულ იქნა." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL არ შეიძლება იყოს ცარიელი." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "შეცდომა" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "გაზიარება" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "სრულად წაშლა" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "გადარქმევა" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "მოცდის რეჟიმში" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} უკვე არსებობს" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "შეცვლა" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "სახელის შემოთავაზება" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "უარყოფა" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} შეცვლილია {old_name}–ით" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "დაბრუნება" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ფაილები იტვირთება" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' არის დაუშვებელი ფაილის სახელი." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ფაილის სახელი არ შეიძლება იყოს ცარიელი." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და '*' არ არის დაიშვებული." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "სახელი" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ზომა" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "შეცვლილია" @@ -229,7 +237,7 @@ msgstr "შეცვლილია" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "ატვირთვა" @@ -265,65 +273,65 @@ msgstr "ZIP ფაილების მაქსიმუმ დასაშვ msgid "Save" msgstr "შენახვა" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "ახალი" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ტექსტური ფაილი" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "საქაღალდე" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "მისამართიდან" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "წაშლილი ფაილები" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ატვირთვის გაუქმება" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "თქვენ არ გაქვთ ჩაწერის უფლება აქ." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "აქ არაფერი არ არის. ატვირთე რამე!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ჩამოტვირთვა" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "გაუზიარებადი" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "წაშლა" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "ასატვირთი ფაილი ძალიან დიდია" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "მიმდინარე სკანირება" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 1b89539f148..fc613d4b9ee 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/km/core.po b/l10n/km/core.po index 1ae42ef89fb..437612ba9d9 100644 --- a/l10n/km/core.po +++ b/l10n/km/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/km/files.po b/l10n/km/files.po index 286dded35fb..a6b9b1775e1 100644 --- a/l10n/km/files.po +++ b/l10n/km/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index bf3b7985905..c46c22d8be3 100644 --- a/l10n/km/settings.po +++ b/l10n/km/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/kn/core.po b/l10n/kn/core.po index 3ee58ec5314..c5dd4fc62ea 100644 --- a/l10n/kn/core.po +++ b/l10n/kn/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/kn/files.po b/l10n/kn/files.po index 59f02ce2c4f..3297285e0e5 100644 --- a/l10n/kn/files.po +++ b/l10n/kn/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index d2cde9a8833..21659f91a5b 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index f1c6f8bdfc4..b545b194b2e 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,51 +192,51 @@ msgstr "12월" msgid "Settings" msgstr "설정" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "초 전" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n분 전 " -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n시간 전 " -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "오늘" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "어제" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n일 전 " -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "지난 달" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n달 전 " -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "개월 전" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "작년" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "년 전" @@ -264,6 +264,45 @@ msgstr "승락" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ko/files.po b/l10n/ko/files.po index 1ab0e4053ab..b2497ad3499 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "디스크에 쓰지 못했습니다" msgid "Not enough storage available" msgstr "저장소가 용량이 충분하지 않습니다." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "업로드 실패" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "올바르지 않은 디렉터리입니다." @@ -88,141 +92,145 @@ msgstr "올바르지 않은 디렉터리입니다." msgid "Files" msgstr "파일" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "여유 공간이 부족합니다" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "업로드가 취소되었습니다." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL을 입력해야 합니다." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "오류" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "공유" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "영원히 삭제" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "이름 바꾸기" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "대기 중" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name}이(가) 이미 존재함" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "바꾸기" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "이름 제안" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "취소" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name}이(가) {new_name}(으)로 대체됨" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "되돌리기" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "파일 업로드중" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 는 올바르지 않은 파일 이름 입니다." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "파일 이름이 비어 있을 수 없습니다." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "이름" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "크기" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "수정됨" @@ -231,7 +239,7 @@ msgstr "수정됨" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "업로드" @@ -267,65 +275,65 @@ msgstr "ZIP 파일 최대 크기" msgid "Save" msgstr "저장" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "새로 만들기" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "텍스트 파일" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "폴더" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "링크에서" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "파일 삭제됨" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "업로드 취소" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "내용이 없습니다. 업로드할 수 있습니다!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "다운로드" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "공유 해제" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "삭제" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "업로드한 파일이 너무 큼" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "파일을 검색하고 있습니다. 기다려 주십시오." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "현재 검색" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 2633c90f1f2..8b3678ceec6 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index b1c2c88c0dd..e29ae2d8757 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "ده‌ستكاری" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 99b5793ea0d..9bb3b4faa5f 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "هه‌ڵه" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "هاوبەشی کردن" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ناو" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "بارکردن" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "پاشکه‌وتکردن" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "بوخچه" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "داگرتن" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index ac9ed942628..6ea9fd128b0 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index d3769f82671..d0e584ef604 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Astellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Sekonnen hir" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "haut" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "gëschter" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "leschte Mount" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Méint hir" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Lescht Joer" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Joren hir" @@ -267,6 +267,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 94e9d242643..40727c4472d 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Konnt net op den Disk schreiwen" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload ofgebrach." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Deelen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ofbriechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "réckgängeg man" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Numm" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Gréisst" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geännert" @@ -232,7 +240,7 @@ msgstr "Geännert" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Eroplueden" @@ -268,65 +276,65 @@ msgstr "Maximal Gréisst fir ZIP Fichieren" msgid "Save" msgstr "Späicheren" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nei" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Text Fichier" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload ofbriechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Hei ass näischt. Lued eppes rop!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Net méi deelen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Läschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload ze grouss" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fichieren gi gescannt, war weg." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Momentane Scan" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 33639b80d3c..d09ca81058c 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 6c51d43a5d0..87de0d1aaac 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 14:50+0000\n" -"Last-Translator: Liudas Ališauskas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -194,59 +194,59 @@ msgstr "Gruodis" msgid "Settings" msgstr "Nustatymai" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "prieš sekundę" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " prieš %n minutę" msgstr[1] " prieš %n minučių" msgstr[2] " prieš %n minučių" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "prieš %n valandą" msgstr[1] "prieš %n valandų" msgstr[2] "prieš %n valandų" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "šiandien" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "vakar" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "prieš %n dieną" msgstr[1] "prieš %n dienas" msgstr[2] "prieš %n dienų" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "praeitą mėnesį" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "prieš %n mėnesį" msgstr[1] "prieš %n mėnesius" msgstr[2] "prieš %n mėnesių" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "prieš mėnesį" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "praeitais metais" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "prieš metus" @@ -274,6 +274,47 @@ msgstr "Gerai" msgid "Error loading message template: {error}" msgstr "Klaida įkeliant žinutės ruošinį: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 13c09972ea5..da69b0a419b 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Liudas Ališauskas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Nepavyko įrašyti į diską" msgid "Not enough storage available" msgstr "Nepakanka vietos serveryje" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Nusiuntimas nepavyko" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neteisingas aplankas" @@ -88,147 +92,151 @@ msgstr "Neteisingas aplankas" msgid "Files" msgstr "Failai" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nepakanka vietos" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Įkėlimas atšauktas." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL negali būti tuščias." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Klaida" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dalintis" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Ištrinti negrįžtamai" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Pervadinti" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Laukiantis" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jau egzistuoja" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "pakeisti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "pasiūlyti pavadinimą" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "atšaukti" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "pakeiskite {new_name} į {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "anuliuoti" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n aplankas" msgstr[1] "%n aplankai" msgstr[2] "%n aplankų" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n failas" msgstr[1] "%n failai" msgstr[2] "%n failų" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ir {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Įkeliamas %n failas" msgstr[1] "Įkeliami %n failai" msgstr[2] "Įkeliama %n failų" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "įkeliami failai" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' yra neleidžiamas failo pavadinime." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Failo pavadinimas negali būti tuščias." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Jūsų visa vieta serveryje užimta" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Pavadinimas" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dydis" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Pakeista" @@ -237,7 +245,7 @@ msgstr "Pakeista" msgid "%s could not be renamed" msgstr "%s negali būti pervadintas" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Įkelti" @@ -273,65 +281,65 @@ msgstr "Maksimalus ZIP archyvo failo dydis" msgid "Save" msgstr "Išsaugoti" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Naujas" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Teksto failas" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Katalogas" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Iš nuorodos" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ištrinti failai" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Atšaukti siuntimą" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Jūs neturite rašymo leidimo." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Čia tuščia. Įkelkite ką nors!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Atsisiųsti" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Nebesidalinti" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ištrinti" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Įkėlimui failas per didelis" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skenuojami failai, prašome palaukti." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Šiuo metu skenuojama" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index d651f762750..14592409dd9 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index a0a14df889d..b4f827bd08f 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,59 +191,59 @@ msgstr "Decembris" msgid "Settings" msgstr "Iestatījumi" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundes atpakaļ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Tagad, %n minūtes" msgstr[1] "Pirms %n minūtes" msgstr[2] "Pirms %n minūtēm" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Šodien, %n stundas" msgstr[1] "Pirms %n stundas" msgstr[2] "Pirms %n stundām" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "šodien" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "vakar" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Šodien, %n dienas" msgstr[1] "Pirms %n dienas" msgstr[2] "Pirms %n dienām" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "pagājušajā mēnesī" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Šomēnes, %n mēneši" msgstr[1] "Pirms %n mēneša" msgstr[2] "Pirms %n mēnešiem" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mēnešus atpakaļ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "gājušajā gadā" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "gadus atpakaļ" @@ -271,6 +271,47 @@ msgstr "Labi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/lv/files.po b/l10n/lv/files.po index c173b6e331c..c2bec93c458 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Neizdevās saglabāt diskā" msgid "Not enough storage available" msgstr "Nav pietiekami daudz vietas" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Neizdevās augšupielādēt" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Nederīga direktorija." @@ -87,147 +91,151 @@ msgstr "Nederīga direktorija." msgid "Files" msgstr "Datnes" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nepietiek brīvas vietas" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Augšupielāde ir atcelta." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nevar būt tukšs." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Kļūda" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dalīties" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Dzēst pavisam" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Pārsaukt" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Gaida savu kārtu" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jau eksistē" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "aizvietot" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "ieteiktais nosaukums" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "atcelt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "aizvietoja {new_name} ar {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "atsaukt" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapes" msgstr[1] "%n mape" msgstr[2] "%n mapes" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n faili" msgstr[1] "%n fails" msgstr[2] "%n faili" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n" msgstr[1] "Augšupielāde %n failu" msgstr[2] "Augšupielāde %n failus" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fails augšupielādējas" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ir nederīgs datnes nosaukums." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Datnes nosaukums nevar būt tukšs." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nosaukums" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Izmērs" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Mainīts" @@ -236,7 +244,7 @@ msgstr "Mainīts" msgid "%s could not be renamed" msgstr "%s nevar tikt pārsaukts" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Augšupielādēt" @@ -272,65 +280,65 @@ msgstr "Maksimālais ievades izmērs ZIP datnēm" msgid "Save" msgstr "Saglabāt" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Jauna" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Teksta datne" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mape" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "No saites" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Dzēstās datnes" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Atcelt augšupielādi" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Jums nav tiesību šeit rakstīt." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lejupielādēt" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Pārtraukt dalīšanos" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Dzēst" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Datne ir par lielu, lai to augšupielādētu" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Šobrīd tiek caurskatīts" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 9f3e95c7174..68f2e3c4db4 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 4adcd52cb6c..94b36d5a9c5 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Декември" msgid "Settings" msgstr "Подесувања" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "пред секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "денеска" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "минатиот месец" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "пред месеци" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "минатата година" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "пред години" @@ -266,6 +266,46 @@ msgstr "Во ред" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 3d0602225b0..a075f4d8f84 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Неуспеав да запишам на диск" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Датотеки" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Преземањето е прекинато." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Адресата неможе да биде празна." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Сподели" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименувај" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Чека" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} веќе постои" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "замени" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложи име" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "откажи" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "заменета {new_name} со {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "врати" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Големина" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Променето" @@ -232,7 +240,7 @@ msgstr "Променето" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Подигни" @@ -268,65 +276,65 @@ msgstr "Максимална големина за внес на ZIP датот msgid "Save" msgstr "Сними" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ново" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстуална датотека" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Од врска" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Преземи" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Не споделувај" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Избриши" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Фајлот кој се вчитува е преголем" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Се скенираат датотеки, ве молам почекајте." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Моментално скенирам" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 78ab0823ab6..d8573ecf006 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po index 18bc15e9ed7..8e7523af26c 100644 --- a/l10n/ml_IN/core.po +++ b/l10n/ml_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po index 6f1d3f841e5..5a25ca39107 100644 --- a/l10n/ml_IN/files.po +++ b/l10n/ml_IN/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index eacef25fc6b..127decca790 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 18895df227e..38457ad1118 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "Disember" msgid "Settings" msgstr "Tetapan" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 27f7519e9d3..05de8db4dcc 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Gagal untuk disimpan" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "Fail-fail" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Muatnaik dibatalkan." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Ralat" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Kongsi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Dalam proses" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ganti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "Batal" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nama" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Saiz" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Dimodifikasi" @@ -229,7 +237,7 @@ msgstr "Dimodifikasi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Muat naik" @@ -265,65 +273,65 @@ msgstr "Saiz maksimum input untuk fail ZIP" msgid "Save" msgstr "Simpan" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Baru" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fail teks" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Batal muat naik" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tiada apa-apa di sini. Muat naik sesuatu!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Muat turun" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Padam" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Muatnaik terlalu besar" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fail sedang diimbas, harap bersabar." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Imbasan semasa" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index f4ab52b45c1..c144cf2096c 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 3732fcec7ab..d66c528d963 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "ဒီဇင်ဘာ" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "စက္ကန့်အနည်းငယ်က" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ယနေ့" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "မနေ့က" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ပြီးခဲ့သောလ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "မနှစ်က" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "နှစ် အရင်က" @@ -262,6 +262,45 @@ msgstr "အိုကေ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po index 65da5b18778..a143e196594 100644 --- a/l10n/my_MM/files.po +++ b/l10n/my_MM/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ဖိုင်များ" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "ဒေါင်းလုတ်" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index f8cd38d9c5e..144af1c4211 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 74f64d6762b..7d6a9bedeb1 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillinger" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "forrige måned" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "måneder siden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "forrige år" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år siden" @@ -267,6 +267,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 318d4d445a5..e5f3ebc6c84 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Klarte ikke å skrive til disk" msgid "Not enough storage available" msgstr "Ikke nok lagringsplass" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Opplasting feilet" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig katalog." @@ -89,144 +93,148 @@ msgstr "Ugyldig katalog." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -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/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ikke nok lagringsplass" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Opplasting avbrutt." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 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/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL-en kan ikke være tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Feil" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slett permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Gi nytt navn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ventende" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finnes allerede" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "erstatt" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "erstattet {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "angre" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laster opp %n fil" msgstr[1] "Laster opp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer lastes opp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er et ugyldig filnavn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnavn kan ikke være tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Navn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Størrelse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Endret" @@ -235,7 +243,7 @@ msgstr "Endret" msgid "%s could not be renamed" msgstr "Kunne ikke gi nytt navn til %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Last opp" @@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP-filer" msgid "Save" msgstr "Lagre" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Fra link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Slettet filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikke skrivetilgang her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Last ned" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Avslutt deling" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slett" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Filen er for stor" -#: templates/index.php:110 +#: templates/index.php:102 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:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skanner filer, vennligst vent." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Pågående skanning" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 55c24f51b9d..fe0d19856af 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ne/core.po b/l10n/ne/core.po index 10549b66bad..52425ae2ab0 100644 --- a/l10n/ne/core.po +++ b/l10n/ne/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ne/files.po b/l10n/ne/files.po index 16ee2747372..99b4c542210 100644 --- a/l10n/ne/files.po +++ b/l10n/ne/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index 0a5f4dc015a..855bab38ba2 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 42fe772e224..9b6abbaf29c 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "december" msgid "Settings" msgstr "Instellingen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "seconden geleden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n minuten geleden" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n uur geleden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "vandaag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "gisteren" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n dagen geleden" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "vorige maand" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n maanden geleden" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "maanden geleden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "vorig jaar" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "jaar geleden" @@ -269,6 +269,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Fout bij laden berichtensjabloon: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/nl/files.po b/l10n/nl/files.po index e8546df4ad2..68d1ce8e06b 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: kwillems \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Schrijven naar schijf mislukt" msgid "Not enough storage available" msgstr "Niet genoeg opslagruimte beschikbaar" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload mislukt" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ongeldige directory." @@ -88,144 +92,148 @@ msgstr "Ongeldige directory." msgid "Files" msgstr "Bestanden" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Niet genoeg ruimte beschikbaar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Uploaden geannuleerd." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL kan niet leeg zijn." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fout" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Delen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Verwijder definitief" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Hernoem" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "In behandeling" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} bestaat al" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "vervang" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Stel een naam voor" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annuleren" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "verving {new_name} met {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ongedaan maken" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n mappen" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n bestanden" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} en {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n bestand aan het uploaden" msgstr[1] "%n bestanden aan het uploaden" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "bestanden aan het uploaden" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' is een ongeldige bestandsnaam." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Bestandsnaam kan niet leeg zijn." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Naam" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grootte" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Aangepast" @@ -234,7 +242,7 @@ msgstr "Aangepast" msgid "%s could not be renamed" msgstr "%s kon niet worden hernoemd" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Uploaden" @@ -270,65 +278,65 @@ msgstr "Maximale grootte voor ZIP bestanden" msgid "Save" msgstr "Bewaren" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nieuw" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstbestand" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Map" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Vanaf link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Verwijderde bestanden" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload afbreken" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "U hebt hier geen schrijfpermissies." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Er bevindt zich hier niets. Upload een bestand!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Downloaden" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Stop met delen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Verwijder" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload is te groot" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Bestanden worden gescand, even wachten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Er wordt gescand" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 1baf2c7cab2..68edba7080a 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 87a27da4b85..42a5e395e01 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillingar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekund sidan" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minutt sidan" msgstr[1] "%n minutt sidan" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time sidan" msgstr[1] "%n timar sidan" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sidan" msgstr[1] "%n dagar sidan" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "førre månad" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sidan" msgstr[1] "%n månadar sidan" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "månadar sidan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "i fjor" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år sidan" @@ -269,6 +269,46 @@ msgstr "Greitt" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 049246c47e1..0573ecf2951 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: unhammer \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Klarte ikkje skriva til disk" msgid "Not enough storage available" msgstr "Ikkje nok lagringsplass tilgjengeleg" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Feil ved opplasting" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -88,144 +92,148 @@ msgstr "Ugyldig mappe." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ikkje nok lagringsplass tilgjengeleg" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Opplasting avbroten." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Nettadressa kan ikkje vera tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Feil" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slett for godt" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Endra namn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Under vegs" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finst allereie" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "byt ut" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "føreslå namn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "bytte ut {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "angre" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} og {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lastar opp %n fil" msgstr[1] "Lastar opp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer lastar opp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "«.» er eit ugyldig filnamn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnamnet kan ikkje vera tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lagringa di er nesten full ({usedSpacePercent} %)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Namn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Storleik" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Endra" @@ -234,7 +242,7 @@ msgstr "Endra" msgid "%s could not be renamed" msgstr "Klarte ikkje å omdøypa på %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Last opp" @@ -270,65 +278,65 @@ msgstr "Maksimal storleik for ZIP-filer" msgid "Save" msgstr "Lagre" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekst fil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Frå lenkje" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Sletta filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikkje skriverettar her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last noko opp!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Last ned" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Udel" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slett" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "For stor opplasting" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skannar filer, ver venleg og vent." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Køyrande skanning" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 8fa98b0bea8..6100216bbda 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po index 27d872844d4..e50801d30ba 100644 --- a/l10n/nqo/core.po +++ b/l10n/nqo/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po index ee3f40afbc4..4749e89f264 100644 --- a/l10n/nqo/files.po +++ b/l10n/nqo/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 4c9ef40f604..aafbac399b0 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 42aeba0c189..91003bba794 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configuracion" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segonda a" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "uèi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ièr" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mes passat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses a" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "an passat" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ans a" @@ -266,6 +266,46 @@ msgstr "D'accòrdi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/oc/files.po b/l10n/oc/files.po index 1630f022556..df81825fe3f 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "L'escriptura sul disc a fracassat" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Fichièrs" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Amontcargar anullat." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. " -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Parteja" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Torna nomenar" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Al esperar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "remplaça" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "nom prepausat" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulla" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "defar" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fichièrs al amontcargar" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Talha" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -232,7 +240,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Amontcarga" @@ -268,65 +276,65 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP" msgid "Save" msgstr "Enregistra" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nòu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fichièr de tèxte" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dorsièr" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr " Anulla l'amontcargar" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Pas res dedins. Amontcarga qualquaren" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Avalcarga" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Pas partejador" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Escafa" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Amontcargament tròp gròs" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Los fiichièrs son a èsser explorats, " -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Exploracion en cors" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index ed8d2ec20a2..bd0c36692d2 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pa/core.po b/l10n/pa/core.po index 695b684902f..a7fc0e1e131 100644 --- a/l10n/pa/core.po +++ b/l10n/pa/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:14+0000\n" -"Last-Translator: A S Alam \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,55 +191,55 @@ msgstr "ਦਸੰਬਰ" msgid "Settings" msgstr "ਸੈਟਿੰਗ" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ਅੱਜ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ਕੱਲ੍ਹ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ਪਿਛਲੇ ਮਹੀਨੇ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ਪਿਛਲੇ ਸਾਲ" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ" @@ -267,6 +267,46 @@ msgstr "ਠੀਕ ਹੈ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/pa/files.po b/l10n/pa/files.po index 54e0656a991..93b8cdfacd0 100644 --- a/l10n/pa/files.po +++ b/l10n/pa/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" -"PO-Revision-Date: 2013-09-17 13:20+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "ਫਾਇਲਾਂ" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ਗਲਤੀ" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ਸਾਂਝਾ ਕਰੋ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "ਨਾਂ ਬਦਲੋ" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "ਵਾਪਸ" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po index 66a45889956..8095ea1076f 100644 --- a/l10n/pa/settings.po +++ b/l10n/pa/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 7e3a4dd2baa..1e9839e6f69 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,59 +192,59 @@ msgstr "Grudzień" msgid "Settings" msgstr "Ustawienia" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute temu" msgstr[1] "%n minut temu" msgstr[2] "%n minut temu" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n godzine temu" msgstr[1] "%n godzin temu" msgstr[2] "%n godzin temu" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "dziś" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dzień temu" msgstr[1] "%n dni temu" msgstr[2] "%n dni temu" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "w zeszłym miesiącu" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n miesiąc temu" msgstr[1] "%n miesięcy temu" msgstr[2] "%n miesięcy temu" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "miesięcy temu" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "w zeszłym roku" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "lat temu" @@ -272,6 +272,47 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 780faa39bcc..b94335006bb 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/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: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Cyryl Sochacki \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,11 +77,15 @@ msgstr "Błąd zapisu na dysk" msgid "Not enough storage available" msgstr "Za mało dostępnego miejsca" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Wysyłanie nie powiodło się" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Zła ścieżka." @@ -89,147 +93,151 @@ msgstr "Zła ścieżka." msgid "Files" msgstr "Pliki" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Za mało miejsca" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Wczytywanie anulowane." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nie może być pusty." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Błąd" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Udostępnij" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Trwale usuń" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Zmień nazwę" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Oczekujące" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} już istnieje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zastąp" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "zasugeruj nazwę" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anuluj" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "zastąpiono {new_name} przez {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "cofnij" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n katalog" msgstr[1] "%n katalogi" msgstr[2] "%n katalogów" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n plik" msgstr[1] "%n pliki" msgstr[2] "%n plików" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{katalogi} and {pliki}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Wysyłanie %n pliku" msgstr[1] "Wysyłanie %n plików" msgstr[2] "Wysyłanie %n plików" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "pliki wczytane" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "„.” jest nieprawidłową nazwą pliku." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nazwa pliku nie może być pusta." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nazwa" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Rozmiar" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modyfikacja" @@ -238,7 +246,7 @@ msgstr "Modyfikacja" msgid "%s could not be renamed" msgstr "%s nie można zmienić nazwy" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Wyślij" @@ -274,65 +282,65 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP " msgid "Save" msgstr "Zapisz" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nowy" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Plik tekstowy" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odnośnika" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Pliki usunięte" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anuluj wysyłanie" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nie masz uprawnień do zapisu w tym miejscu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Pusto. Wyślij coś!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Pobierz" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zatrzymaj współdzielenie" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Usuń" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Ładowany plik jest za duży" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skanowanie plików, proszę czekać." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktualnie skanowane" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index ae9f4924213..5b5e435ef1c 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index ad96fabaeba..06857800f33 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,55 +192,55 @@ msgstr "dezembro" msgid "Settings" msgstr "Ajustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " ha %n minuto" msgstr[1] "ha %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "ha %n hora" msgstr[1] "ha %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoje" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ontem" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "ha %n dia" msgstr[1] "ha %n dias" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "último mês" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "ha %n mês" msgstr[1] "ha %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "último ano" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Erro no carregamento de modelo de mensagem: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index b38bee5e902..d9d4aaf18f5 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/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: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,11 +77,15 @@ msgstr "Falha ao escrever no disco" msgid "Not enough storage available" msgstr "Espaço de armazenamento insuficiente" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Falha no envio" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Diretório inválido." @@ -89,144 +93,148 @@ msgstr "Diretório inválido." msgid "Files" msgstr "Arquivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espaço de armazenamento insuficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL não pode ficar em branco" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartilhar" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Excluir permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} já existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "Substituído {old_name} por {new_name} " -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfazer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n pasta" msgstr[1] "%n pastas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n arquivo" msgstr[1] "%n arquivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Enviando %n arquivo" msgstr[1] "Enviando %n arquivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "enviando arquivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' é um nome de arquivo inválido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome do arquivo não pode estar vazio." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamanho" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -235,7 +243,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s não pode ser renomeado" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -271,65 +279,65 @@ msgstr "Tamanho máximo para arquivo ZIP" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Arquivo texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Pasta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Do link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Arquivos apagados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Você não possui permissão de escrita aqui." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nada aqui.Carrege alguma coisa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Baixar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Descompartilhar" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Excluir" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Arquivos sendo escaneados, por favor aguarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanning atual" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index bfd40a0f931..c8608696d61 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -88,36 +88,32 @@ msgstr "Não foi possível atualizar a app." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Senha errada" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nenhum usuário fornecido" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" - -#: changepassword/controller.php:92 -msgid "message" -msgstr "" +msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso...." -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossível modificar senha" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index b355ad56e02..d0a28fbf406 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -6,13 +6,14 @@ # Bruno Martins , 2013 # bmgmatias , 2013 # Mouxy , 2013 +# Gontxi , 2013 # Helder Meneses , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -96,19 +97,19 @@ msgstr "Erro a remover %s dos favoritos." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Não foi selecionado nenhum ficheiro para importar" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Ficheiro desconhecido" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Foto temporária de perfil indisponível, tente novamente" #: avatar/controller.php:135 msgid "No crop data provided" @@ -194,55 +195,55 @@ msgstr "Dezembro" msgid "Settings" msgstr "Configurações" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Minutos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto atrás" msgstr[1] "%n minutos atrás" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hora atrás" msgstr[1] "%n horas atrás" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoje" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ontem" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dia atrás" msgstr[1] "%n dias atrás" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ultímo mês" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mês atrás" msgstr[1] "%n meses atrás" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ano passado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -268,6 +269,46 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" +msgstr "Erro ao carregar o template: {error}" + +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" msgstr "" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 7bd460d366b..7a359872888 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/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: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Helder Meneses \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Falhou a escrita no disco" msgid "Not enough storage available" msgstr "Não há espaço suficiente em disco" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Carregamento falhou" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directório Inválido" @@ -89,144 +93,148 @@ msgstr "Directório Inválido" msgid "Files" msgstr "Ficheiros" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espaço em disco insuficiente!" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "O URL não pode estar vazio." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Partilhar" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "O nome {new_name} já existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugira um nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "substituido {new_name} por {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfazer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n pasta" msgstr[1] "%n pastas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n ficheiro" msgstr[1] "%n ficheiros" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "A carregar %n ficheiro" msgstr[1] "A carregar %n ficheiros" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "A enviar os ficheiros" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' não é um nome de ficheiro válido!" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome do ficheiro não pode estar vazio." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamanho" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -235,7 +243,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s não pode ser renomeada" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Carregar" @@ -271,65 +279,65 @@ msgstr "Tamanho máximo para ficheiros ZIP" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ficheiro de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Pasta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Da ligação" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ficheiros eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar envio" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Não tem permissões de escrita aqui." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Vazio. Envie alguma coisa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Transferir" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixar de partilhar" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Os ficheiros estão a ser analisados, por favor aguarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index a71bf023222..937940f9572 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 18:40+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" @@ -60,11 +60,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Ficheiro desconhecido" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: defaults.php:35 msgid "web services under your control" @@ -165,15 +165,15 @@ msgstr "Erro na autenticação" msgid "Token expired. Please reload page." msgstr "O token expirou. Por favor recarregue a página." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Ficheiros" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Texto" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Imagens" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 240d92edaf7..f171929bbc3 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -517,7 +513,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 171346b912a..db5393d90c5 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,59 +194,59 @@ msgstr "Decembrie" msgid "Settings" msgstr "Setări" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "secunde în urmă" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "astăzi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ieri" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ultima lună" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "luni în urmă" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ultimul an" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ani în urmă" @@ -274,6 +274,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 0ac14ca3c91..e40c8605cfc 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: inaina \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,15 @@ msgstr "Eroare la scrierea discului" msgid "Not enough storage available" msgstr "Nu este suficient spațiu disponibil" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Încărcarea a eșuat" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "registru invalid." @@ -90,147 +94,151 @@ msgstr "registru invalid." msgid "Files" msgstr "Fișiere" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "lista nu se poate incarca poate fi un fisier sau are 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nu este suficient spațiu disponibil" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Încărcare anulată." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 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/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Adresa URL nu poate fi golita" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Eroare" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "a imparti" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Stergere permanenta" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Redenumire" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "in timpul" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} deja exista" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "înlocuire" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerează nume" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulare" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} inlocuit cu {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "Anulează ultima acțiune" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fișiere se încarcă" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' este un nume invalid de fișier." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Numele fișierului nu poate rămâne gol." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nume" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensiune" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -239,7 +247,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "%s nu a putut fi redenumit" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Încărcare" @@ -275,65 +283,65 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate" msgid "Save" msgstr "Salvează" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nou" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "lista" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosar" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "de la adresa" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Sterge fisierele" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nu ai permisiunea de a scrie aici." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nimic aici. Încarcă ceva!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descarcă" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Anulare" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Șterge" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Fișierul încărcat este prea mare" -#: templates/index.php:110 +#: templates/index.php:102 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:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fișierele sunt scanate, asteptati va rog" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "În curs de scanare" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 1016778fe33..858e3cb2a17 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 1f90ed5e5ef..6570bde0635 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -7,6 +7,7 @@ # lord93 , 2013 # foool , 2013 # eurekafag , 2013 +# sk.avenger , 2013 # Victor Bravo <>, 2013 # Vyacheslav Muranov , 2013 # Den4md , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -44,15 +45,15 @@ msgstr "" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "База данных обновлена" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Обновление файлового кэша, это может занять некоторое время..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Обновлен файловый кэш" #: ajax/update.php:26 #, php-format @@ -104,11 +105,11 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Неизвестный тип файла" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Изображение повреждено" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -198,59 +199,59 @@ msgstr "Декабрь" msgid "Settings" msgstr "Конфигурация" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "несколько секунд назад" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n минуту назад" msgstr[1] "%n минуты назад" msgstr[2] "%n минут назад" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n час назад" msgstr[1] "%n часа назад" msgstr[2] "%n часов назад" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "сегодня" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n день назад" msgstr[1] "%n дня назад" msgstr[2] "%n дней назад" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "в прошлом месяце" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n месяц назад" msgstr[1] "%n месяца назад" msgstr[2] "%n месяцев назад" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "несколько месяцев назад" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "в прошлом году" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "несколько лет назад" @@ -278,6 +279,47 @@ msgstr "Ок" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." @@ -609,11 +651,11 @@ msgstr "будет использовано" #: templates/installation.php:140 msgid "Database user" -msgstr "Имя пользователя для базы данных" +msgstr "Пользователь базы данных" #: templates/installation.php:147 msgid "Database password" -msgstr "Пароль для базы данных" +msgstr "Пароль базы данных" #: templates/installation.php:152 msgid "Database name" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 2db89c27daa..bb956fc01cd 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -6,14 +6,15 @@ # lord93 , 2013 # eurekafag , 2013 # Victor Bravo <>, 2013 +# navigator666 , 2013 # hackproof , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -79,11 +80,15 @@ msgstr "Ошибка записи на диск" msgid "Not enough storage available" msgstr "Недостаточно доступного места в хранилище" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Ошибка загрузки" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Неправильный каталог." @@ -91,147 +96,151 @@ msgstr "Неправильный каталог." msgid "Files" msgstr "Файлы" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Недостаточно свободного места" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Загрузка отменена." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Ссылка не может быть пустой." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Ошибка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Открыть доступ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Удалено навсегда" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Переименовать" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ожидание" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} уже существует" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "заменить" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложить название" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "отмена" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "заменено {new_name} на {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "отмена" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n папка" msgstr[1] "%n папки" msgstr[2] "%n папок" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n файл" msgstr[1] "%n файла" msgstr[2] "%n файлов" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} и {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Закачка %n файла" msgstr[1] "Закачка %n файлов" msgstr[2] "Закачка %n файлов" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "файлы загружаются" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' - неправильное имя файла." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Имя файла не может быть пустым." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Имя" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Размер" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Изменён" @@ -240,7 +249,7 @@ msgstr "Изменён" msgid "%s could not be renamed" msgstr "%s не может быть переименован" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Загрузка" @@ -276,65 +285,65 @@ msgstr "Максимальный исходный размер для ZIP фай msgid "Save" msgstr "Сохранить" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Новый" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстовый файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Из ссылки" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Удалённые файлы" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "У вас нет разрешений на запись здесь." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Здесь ничего нет. Загрузите что-нибудь!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Скачать" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Закрыть общий доступ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Удалить" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файл слишком велик" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Подождите, файлы сканируются." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Текущее сканирование" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 2f638c5bcd0..03120345444 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -5,14 +5,16 @@ # Translators: # Alexander Shashkevych , 2013 # eurekafag , 2013 +# sk.avenger , 2013 +# navigator666 , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 12:50+0000\n" +"Last-Translator: sk.avenger \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" @@ -25,11 +27,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Не выбрано имя приложения" #: app.php:361 msgid "Help" @@ -62,11 +64,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Неизвестный тип файла" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Изображение повреждено" #: defaults.php:35 msgid "web services under your control" @@ -101,38 +103,38 @@ msgstr "Загрузите файл маленьшими порциями, ра #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Не указан источник при установке приложения" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Не указан атрибут href при установке приложения через http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Не указан путь при установке приложения из локального файла" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Архивы %s не поддерживаются" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Не возможно открыть архив при установке приложения" #: installer.php:125 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Приложение не имеет файла info.xml" #: installer.php:131 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Приложение невозможно установить. В нем содержится запрещенный код." #: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Приложение невозможно установить. Не совместимо с текущей версией ownCloud." #: installer.php:146 msgid "" @@ -148,7 +150,7 @@ msgstr "" #: installer.php:162 msgid "App directory already exists" -msgstr "" +msgstr "Папка приложения уже существует" #: installer.php:175 #, php-format @@ -167,15 +169,15 @@ msgstr "Ошибка аутентификации" msgid "Token expired. Please reload page." msgstr "Токен просрочен. Перезагрузите страницу." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Файлы" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Текст" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Изображения" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index edaeaf19326..e70eab1bd49 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -8,14 +8,15 @@ # alfsoft , 2013 # lord93 , 2013 # eurekafag , 2013 +# navigator666 , 2013 # hackproof , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -93,7 +94,7 @@ msgstr "Невозможно обновить приложение" #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Неправильный пароль" #: changepassword/controller.php:42 msgid "No user supplied" @@ -108,7 +109,7 @@ msgstr "" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз." #: changepassword/controller.php:87 msgid "" @@ -116,13 +117,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Невозможно изменить пароль" #: js/apps.js:43 msgid "Update to {appversion}" @@ -142,11 +139,11 @@ msgstr "Подождите..." #: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Ошибка отключения приложения" #: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Ошибка включения приложения" #: js/apps.js:123 msgid "Updating...." @@ -170,7 +167,7 @@ msgstr "Обновлено" #: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Выберите картинку профиля" #: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." @@ -504,27 +501,27 @@ msgstr "Фото профиля" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Закачать новую" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Выберите новый из файлов" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Удалить изображение" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Отмена" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Выберите изображение профиля" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" @@ -551,15 +548,15 @@ msgstr "Шифрование" #: templates/personal.php:140 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Приложение шифрования не активно, отмените шифрование всех ваших файлов." #: templates/personal.php:146 msgid "Log-in password" -msgstr "" +msgstr "Пароль входа" #: templates/personal.php:151 msgid "Decrypt all Files" -msgstr "" +msgstr "Снять шифрование со всех файлов" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index b231595c2f9..a454bfc58e1 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -6,13 +6,14 @@ # Alexander Shashkevych , 2013 # Fenuks , 2013 # alfsoft , 2013 +# navigator666 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 08:20+0000\n" +"Last-Translator: navigator666 \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" @@ -216,7 +217,7 @@ msgstr "Отключение главного сервера" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Только подключение к серверу реплик." #: templates/settings.php:73 msgid "Use TLS" @@ -259,7 +260,7 @@ msgstr "Поле отображаемого имени пользователя" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "Атрибут LDAP, который используется для генерации отображаемого имени пользователя." #: templates/settings.php:81 msgid "Base User Tree" @@ -283,7 +284,7 @@ msgstr "Поле отображаемого имени группы" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "Атрибут LDAP, который используется для генерации отображаемого имени группы." #: templates/settings.php:84 msgid "Base Group Tree" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index a83cde1f4e2..0bd8e5d646b 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "දෙසැම්බර්" msgid "Settings" msgstr "සිටුවම්" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "තත්පරයන්ට පෙර" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "අද" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ඊයේ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "පෙර මාසයේ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "මාස කීපයකට පෙර" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "පෙර අවුරුද්දේ" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "අවුරුදු කීපයකට පෙර" @@ -266,6 +266,46 @@ msgstr "හරි" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index 00c7fd92b17..6a62c6c1ea1 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "උඩුගත කිරීම අසාර්ථකයි" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "ගොනු" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "උඩුගත කිරීම අත් හරින්න ලදී" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "යොමුව හිස් විය නොහැක" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "දෝෂයක්" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "බෙදා හදා ගන්න" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "නැවත නම් කරන්න" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ප්‍රතිස්ථාපනය කරන්න" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "නමක් යෝජනා කරන්න" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "අත් හරින්න" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "නිෂ්ප්‍රභ කරන්න" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "නම" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ප්‍රමාණය" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "වෙනස් කළ" @@ -232,7 +240,7 @@ msgstr "වෙනස් කළ" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "උඩුගත කරන්න" @@ -268,65 +276,65 @@ msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරි msgid "Save" msgstr "සුරකින්න" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "නව" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "පෙළ ගොනුව" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "ෆෝල්ඩරය" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "යොමුවෙන්" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "උඩුගත කිරීම අත් හරින්න" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "බාන්න" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "නොබෙදු" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "මකා දමන්න" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "උඩුගත කිරීම විශාල වැඩිය" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "වර්තමාන පරික්ෂාව" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 78e5accf9e1..dede6a46ee8 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sk/core.po b/l10n/sk/core.po index 0d0fc7e389d..6970d1b3c74 100644 --- a/l10n/sk/core.po +++ b/l10n/sk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -190,59 +190,59 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -270,6 +270,47 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sk/files.po b/l10n/sk/files.po index 17be34bd16c..070448f726f 100644 --- a/l10n/sk/files.po +++ b/l10n/sk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -235,7 +243,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index de97d238d76..864614817b2 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index d1abe24db2d..22b868c88e6 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,59 +192,59 @@ msgstr "December" msgid "Settings" msgstr "Nastavenia" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pred sekundami" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minútou" msgstr[1] "pred %n minútami" msgstr[2] "pred %n minútami" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n hodinou" msgstr[1] "pred %n hodinami" msgstr[2] "pred %n hodinami" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "dnes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včera" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "pred %n dňom" msgstr[1] "pred %n dňami" msgstr[2] "pred %n dňami" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "minulý mesiac" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesiacom" msgstr[1] "pred %n mesiacmi" msgstr[2] "pred %n mesiacmi" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "pred mesiacmi" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "minulý rok" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "pred rokmi" @@ -272,6 +272,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 13b2c321e86..fd554f6c973 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Zápis na disk sa nepodaril" msgid "Not enough storage available" msgstr "Nedostatok dostupného úložného priestoru" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Odoslanie bolo neúspešné" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neplatný priečinok." @@ -87,147 +91,151 @@ msgstr "Neplatný priečinok." msgid "Files" msgstr "Súbory" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nie je k dispozícii dostatok miesta" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Odosielanie zrušené." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nemôže byť prázdne." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Chyba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Zdieľať" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Zmazať trvalo" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Premenovať" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Prebieha" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} už existuje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "nahradiť" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "pomôcť s menom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "zrušiť" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "prepísaný {new_name} súborom {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrátiť" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n priečinok" msgstr[1] "%n priečinky" msgstr[2] "%n priečinkov" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n súbor" msgstr[1] "%n súbory" msgstr[2] "%n súborov" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávam %n súbor" msgstr[1] "Nahrávam %n súbory" msgstr[2] "Nahrávam %n súborov" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "nahrávanie súborov" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neplatné meno súboru." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Meno súboru nemôže byť prázdne" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Názov" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veľkosť" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Upravené" @@ -236,7 +244,7 @@ msgstr "Upravené" msgid "%s could not be renamed" msgstr "%s nemohol byť premenovaný" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Odoslať" @@ -272,65 +280,65 @@ msgstr "Najväčšia veľkosť ZIP súborov" msgid "Save" msgstr "Uložiť" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nová" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textový súbor" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Priečinok" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odkazu" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Zmazané súbory" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Zrušiť odosielanie" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nemáte oprávnenie na zápis." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Žiadny súbor. Nahrajte niečo!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Sťahovanie" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zrušiť zdieľanie" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Zmazať" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Nahrávanie je príliš veľké" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Čakajte, súbory sú prehľadávané." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Práve prezerané" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 000abca08a0..961d19a242b 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 5df1c0fa5c1..d67d119a51b 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,11 +192,11 @@ msgstr "december" msgid "Settings" msgstr "Nastavitve" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -204,7 +204,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -212,15 +212,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "danes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včeraj" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -228,11 +228,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "zadnji mesec" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -240,15 +240,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesecev nazaj" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "lansko leto" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "let nazaj" @@ -276,6 +276,48 @@ msgstr "V redu" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 6b461d6107b..d8dee234cc0 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Pisanje na disk je spodletelo" msgid "Not enough storage available" msgstr "Na voljo ni dovolj prostora" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Pošiljanje je spodletelo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neveljavna mapa." @@ -87,76 +91,80 @@ msgstr "Neveljavna mapa." msgid "Files" msgstr "Datoteke" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Na voljo ni dovolj prostora." -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Pošiljanje je preklicano." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Naslov URL ne sme biti prazna vrednost." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Napaka" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Souporaba" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Izbriši dokončno" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Preimenuj" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "V čakanju ..." -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} že obstaja" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zamenjaj" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "predlagaj ime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "prekliči" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "preimenovano ime {new_name} z imenom {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "razveljavi" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -164,7 +172,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -172,11 +180,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -184,53 +192,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "poteka pošiljanje datotek" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neveljavno ime datoteke." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Ime datoteke ne sme biti prazno polje." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Velikost" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Spremenjeno" @@ -239,7 +247,7 @@ msgstr "Spremenjeno" msgid "%s could not be renamed" msgstr "%s ni bilo mogoče preimenovati" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Pošlji" @@ -275,65 +283,65 @@ msgstr "Največja vhodna velikost za datoteke ZIP" msgid "Save" msgstr "Shrani" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Besedilna datoteka" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mapa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Iz povezave" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Izbrisane datoteke" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Prekliči pošiljanje" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Za to mesto ni ustreznih dovoljenj za pisanje." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Prejmi" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Prekliči souporabo" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Izbriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Prekoračenje omejitve velikosti" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Poteka preučevanje datotek, počakajte ..." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Trenutno poteka preučevanje" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 4a2acfea748..dd0437a4bdd 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index d87486309e3..249f4fdcadf 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Dhjetor" msgid "Settings" msgstr "Parametra" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekonda më parë" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut më parë" msgstr[1] "%n minuta më parë" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n orë më parë" msgstr[1] "%n orë më parë" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "sot" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "dje" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ditë më parë" msgstr[1] "%n ditë më parë" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "muajin e shkuar" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n muaj më parë" msgstr[1] "%n muaj më parë" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "muaj më parë" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "vitin e shkuar" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "vite më parë" @@ -268,6 +268,46 @@ msgstr "Në rregull" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sq/files.po b/l10n/sq/files.po index 3bf0e4962c0..a5b9a669e29 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Odeen \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "Ruajtja në disk dështoi" msgid "Not enough storage available" msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Ngarkimi dështoi" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Dosje e pavlefshme." @@ -87,144 +91,148 @@ msgstr "Dosje e pavlefshme." msgid "Files" msgstr "Skedarët" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nuk ka hapësirë memorizimi e mjaftueshme" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Ngarkimi u anulua." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL-i nuk mund të jetë bosh." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Veprim i gabuar" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Nda" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Elimino përfundimisht" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Riemërto" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pezulluar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ekziston" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zëvëndëso" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugjero një emër" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulo" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "U zëvëndësua {new_name} me {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "anulo" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dosje" msgstr[1] "%n dosje" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n skedar" msgstr[1] "%n skedarë" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} dhe {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Po ngarkoj %n skedar" msgstr[1] "Po ngarkoj %n skedarë" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "po ngarkoj skedarët" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' është emër i pavlefshëm." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Emri i skedarit nuk mund të jetë bosh." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Emri" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensioni" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifikuar" @@ -233,7 +241,7 @@ msgstr "Modifikuar" msgid "%s could not be renamed" msgstr "Nuk është i mundur riemërtimi i %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Ngarko" @@ -269,65 +277,65 @@ msgstr "Dimensioni maksimal i ngarkimit të skedarëve ZIP" msgid "Save" msgstr "Ruaj" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "I ri" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Skedar teksti" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosje" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Nga lidhja" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Skedarë të eliminuar" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anulo ngarkimin" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nuk keni të drejta për të shkruar këtu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Shkarko" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Hiq ndarjen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Elimino" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Ngarkimi është shumë i madh" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skedarët po analizohen, ju lutemi pritni." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Analizimi aktual" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 05680ab5d73..033a815c20c 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index c146f275ab3..6c29c2d9def 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Децембар" msgid "Settings" msgstr "Поставке" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "пре неколико секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "данас" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "јуче" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "прошлог месеца" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "месеци раније" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "прошле године" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "година раније" @@ -270,6 +270,47 @@ msgstr "У реду" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 31dda625a60..58518b339be 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Не могу да пишем на диск" msgid "Not enough storage available" msgstr "Нема довољно простора" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Отпремање није успело" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "неисправна фасцикла." @@ -86,147 +90,151 @@ msgstr "неисправна фасцикла." msgid "Files" msgstr "Датотеке" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Нема довољно простора" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Отпремање је прекинуто." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Адреса не може бити празна." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Дели" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Обриши за стално" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименуј" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "На чекању" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} већ постоји" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "замени" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложи назив" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "откажи" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "замењено {new_name} са {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "опозови" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "датотеке се отпремају" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "Датотека „.“ је неисправног имена." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Име датотеке не може бити празно." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Величина" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Измењено" @@ -235,7 +243,7 @@ msgstr "Измењено" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Отпреми" @@ -271,65 +279,65 @@ msgstr "Највећа величина ZIP датотека" msgid "Save" msgstr "Сачувај" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Нова" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "текстуална датотека" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "фасцикла" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Са везе" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Обрисане датотеке" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Прекини отпремање" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Овде немате дозволу за писање." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Овде нема ничег. Отпремите нешто!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Преузми" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Укини дељење" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Обриши" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Датотека је превелика" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеке које желите да отпремите прелазе ограничење у величини." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Скенирам датотеке…" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Тренутно скенирање" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index ba7da173f28..ee77f11fb6e 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index 89721e4a20b..6fc014eedf4 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# lemi667 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -53,42 +54,42 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Tip kategorije nije zadan." #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "Bez dodavanja kategorije?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Kategorija već postoji: %s" #: 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 "Tip objekta nije zadan." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID nije zadan." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Greška u dodavanju %s u omiljeno." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "Kategorije za brisanje nisu izabrane." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Greška u uklanjanju %s iz omiljeno." #: avatar/controller.php:62 msgid "No image or file provided" @@ -190,65 +191,65 @@ msgstr "Decembar" msgid "Settings" msgstr "Podešavanja" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" -msgstr "" +msgstr "Pre par sekundi" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" -msgstr "" +msgstr "Danas" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" -msgstr "" +msgstr "juče" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" -msgstr "" +msgstr "prošlog meseca" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" -msgstr "" +msgstr "pre nekoliko meseci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" -msgstr "" +msgstr "prošle godine" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" -msgstr "" +msgstr "pre nekoliko godina" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "Izaberi" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" @@ -256,24 +257,65 @@ msgstr "" #: js/oc-dialogs.js:172 msgid "Yes" -msgstr "" +msgstr "Da" #: js/oc-dialogs.js:182 msgid "No" -msgstr "" +msgstr "Ne" #: js/oc-dialogs.js:199 msgid "Ok" -msgstr "" +msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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 "Tip objekta nije zadan." #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 @@ -281,55 +323,55 @@ msgstr "" #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 #: js/share.js:645 js/share.js:657 msgid "Error" -msgstr "" +msgstr "Greška" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Ime aplikacije nije precizirano." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Potreban fajl {file} nije instaliran!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Deljeno" #: js/share.js:90 msgid "Share" -msgstr "" +msgstr "Podeli" #: js/share.js:131 js/share.js:685 msgid "Error while sharing" -msgstr "" +msgstr "Greška pri deljenju" #: js/share.js:142 msgid "Error while unsharing" -msgstr "" +msgstr "Greška u uklanjanju deljenja" #: js/share.js:149 msgid "Error while changing permissions" -msgstr "" +msgstr "Greška u promeni dozvola" #: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "{owner} podelio sa Vama i grupom {group} " #: js/share.js:160 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Sa vama podelio {owner}" #: js/share.js:183 msgid "Share with" -msgstr "" +msgstr "Podeli sa" #: js/share.js:188 msgid "Share with link" -msgstr "" +msgstr "Podeli koristei link" #: js/share.js:191 msgid "Password protect" -msgstr "" +msgstr "Zaštita lozinkom" #: js/share.js:193 templates/installation.php:57 templates/login.php:26 msgid "Password" @@ -341,94 +383,94 @@ msgstr "" #: js/share.js:202 msgid "Email link to person" -msgstr "" +msgstr "Pošalji link e-mailom" #: js/share.js:203 msgid "Send" -msgstr "" +msgstr "Pošalji" #: js/share.js:208 msgid "Set expiration date" -msgstr "" +msgstr "Datum isteka" #: js/share.js:209 msgid "Expiration date" -msgstr "" +msgstr "Datum isteka" #: js/share.js:242 msgid "Share via email:" -msgstr "" +msgstr "Deli putem e-maila" #: js/share.js:245 msgid "No people found" -msgstr "" +msgstr "Nema pronađenih ljudi" #: js/share.js:283 msgid "Resharing is not allowed" -msgstr "" +msgstr "Dalje deljenje nije dozvoljeno" #: js/share.js:319 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Deljeno u {item} sa {user}" #: js/share.js:340 msgid "Unshare" -msgstr "" +msgstr "Ukljoni deljenje" #: js/share.js:352 msgid "can edit" -msgstr "" +msgstr "dozvoljene izmene" #: js/share.js:354 msgid "access control" -msgstr "" +msgstr "kontrola pristupa" #: js/share.js:357 msgid "create" -msgstr "" +msgstr "napravi" #: js/share.js:360 msgid "update" -msgstr "" +msgstr "ažuriranje" #: js/share.js:363 msgid "delete" -msgstr "" +msgstr "brisanje" #: js/share.js:366 msgid "share" -msgstr "" +msgstr "deljenje" #: js/share.js:400 js/share.js:632 msgid "Password protected" -msgstr "" +msgstr "Zaštćeno lozinkom" #: js/share.js:645 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Greška u uklanjanju datuma isteka" #: js/share.js:657 msgid "Error setting expiration date" -msgstr "" +msgstr "Greška u postavljanju datuma isteka" #: js/share.js:672 msgid "Sending ..." -msgstr "" +msgstr "Slanje..." #: js/share.js:683 msgid "Email sent" -msgstr "" +msgstr "Email poslat" #: js/update.js:17 msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Ažuriranje nije uspelo. Molimo obavestite ownCloud zajednicu." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud." #: lostpassword/controller.php:62 #, php-format @@ -437,7 +479,7 @@ msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "Koristite sledeći link za reset lozinke: {link}" #: lostpassword/templates/lostpassword.php:4 msgid "" @@ -481,7 +523,7 @@ msgstr "Vaša lozinka je resetovana" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "Na login stranicu" #: lostpassword/templates/resetpassword.php:8 msgid "New password" @@ -513,7 +555,7 @@ msgstr "Pomoć" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Pristup zabranjen" #: templates/404.php:15 msgid "Cloud not found" @@ -532,20 +574,20 @@ msgstr "" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" -msgstr "" +msgstr "Izmena kategorija" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "Dodaj" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 msgid "Security Warning" -msgstr "" +msgstr "Bezbednosno upozorenje" #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" -msgstr "" +msgstr "Vaša PHP verzija je ranjiva na " #: templates/installation.php:26 #, php-format @@ -556,19 +598,19 @@ msgstr "" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Nije dostupan generator slučajnog broja, molimo omogućite PHP OpenSSL ekstenziju." #: templates/installation.php:33 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog." #: templates/installation.php:39 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše." #: templates/installation.php:41 #, php-format @@ -587,7 +629,7 @@ msgstr "Napredno" #: templates/installation.php:67 msgid "Data folder" -msgstr "Facikla podataka" +msgstr "Fascikla podataka" #: templates/installation.php:77 msgid "Configure the database" @@ -613,7 +655,7 @@ msgstr "Ime baze" #: templates/installation.php:160 msgid "Database tablespace" -msgstr "" +msgstr "tablespace baze" #: templates/installation.php:167 msgid "Database host" @@ -634,7 +676,7 @@ msgstr "Odjava" #: templates/login.php:9 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Automatsko logovanje odbijeno!" #: templates/login.php:10 msgid "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index c1b281b797f..72c25ecb2ed 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "Fajlovi" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" -msgstr "" +msgstr "Greška" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" -msgstr "" +msgstr "Podeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Zadnja izmena" @@ -235,7 +243,7 @@ msgstr "Zadnja izmena" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Pošalji" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "Snimi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ovde nema ničeg. Pošaljite nešto!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" -msgstr "" +msgstr "Ukljoni deljenje" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Obriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Pošiljka je prevelika" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po index f1524d3b935..0c52072bbaa 100644 --- a/l10n/sr@latin/files_trashbin.po +++ b/l10n/sr@latin/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -27,45 +27,45 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" -msgstr "" +msgstr "Greška" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Ime" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "" -#: js/trash.js:191 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/trash.js:197 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "" @@ -73,11 +73,11 @@ msgstr "" msgid "Nothing in here. Your trash bin is empty!" msgstr "" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Obriši" diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po index 6af1411e01b..afa426b476b 100644 --- a/l10n/sr@latin/lib.po +++ b/l10n/sr@latin/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -164,15 +164,15 @@ msgstr "Greška pri autentifikaciji" msgid "Token expired. Please reload page." msgstr "" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fajlovi" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Tekst" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "" @@ -278,7 +278,7 @@ msgstr "" #: template/functions.php:96 msgid "seconds ago" -msgstr "" +msgstr "Pre par sekundi" #: template/functions.php:97 msgid "%n minute ago" @@ -296,11 +296,11 @@ msgstr[2] "" #: template/functions.php:99 msgid "today" -msgstr "" +msgstr "Danas" #: template/functions.php:100 msgid "yesterday" -msgstr "" +msgstr "juče" #: template/functions.php:101 msgid "%n day go" @@ -311,7 +311,7 @@ msgstr[2] "" #: template/functions.php:102 msgid "last month" -msgstr "" +msgstr "prošlog meseca" #: template/functions.php:103 msgid "%n month ago" @@ -322,11 +322,11 @@ msgstr[2] "" #: template/functions.php:104 msgid "last year" -msgstr "" +msgstr "prošle godine" #: template/functions.php:105 msgid "years ago" -msgstr "" +msgstr "pre nekoliko godina" #: template.php:297 msgid "Caused by:" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index 28437f33e6d..eaddf7af119 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -151,7 +147,7 @@ msgstr "" #: js/apps.js:126 msgid "Error" -msgstr "" +msgstr "Greška" #: js/apps.js:127 templates/apps.php:43 msgid "Update" @@ -220,7 +216,7 @@ msgstr "" #: templates/admin.php:15 msgid "Security Warning" -msgstr "" +msgstr "Bezbednosno upozorenje" #: templates/admin.php:18 msgid "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index cdb427f5c8c..32f10400a2c 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -67,7 +67,7 @@ msgstr "" #: js/settings.js:117 msgid "Error" -msgstr "" +msgstr "Greška" #: js/settings.js:141 msgid "Connection test succeeded" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 4ed86320a27..84b71673c35 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,55 +194,55 @@ msgstr "December" msgid "Settings" msgstr "Inställningar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder sedan" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut sedan" msgstr[1] "%n minuter sedan" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n timme sedan" msgstr[1] "%n timmar sedan" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sedan" msgstr[1] "%n dagar sedan" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "förra månaden" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sedan" msgstr[1] "%n månader sedan" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "månader sedan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "förra året" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år sedan" @@ -270,6 +270,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 6b498778cf9..3fe12b46d57 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Misslyckades spara till disk" msgid "Not enough storage available" msgstr "Inte tillräckligt med lagringsutrymme tillgängligt" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Misslyckad uppladdning" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Felaktig mapp." @@ -90,144 +94,148 @@ msgstr "Felaktig mapp." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Inte tillräckligt med utrymme tillgängligt" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Uppladdning avbruten." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL kan inte vara tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fel" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dela" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Radera permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Byt namn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Väntar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finns redan" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersätt" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "föreslå namn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "ersatt {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ångra" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapp" msgstr[1] "%n mappar" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} och {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laddar upp %n fil" msgstr[1] "Laddar upp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer laddas upp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' är ett ogiltigt filnamn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnamn kan inte vara tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Namn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Storlek" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Ändrad" @@ -236,7 +244,7 @@ msgstr "Ändrad" msgid "%s could not be renamed" msgstr "%s kunde inte namnändras" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Ladda upp" @@ -272,65 +280,65 @@ msgstr "Största tillåtna storlek för ZIP-filer" msgid "Save" msgstr "Spara" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mapp" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Från länk" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Raderade filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt uppladdning" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du saknar skrivbehörighet här." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting här. Ladda upp något!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Ladda ner" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Sluta dela" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Radera" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "För stor uppladdning" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Filer skannas, var god vänta" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktuell skanning" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index f6ced07827c..284b1287a87 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -115,11 +115,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po index 46d6c564324..7b0e7105489 100644 --- a/l10n/sw_KE/core.po +++ b/l10n/sw_KE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po index f32f2a01fde..b12e3fb13dc 100644 --- a/l10n/sw_KE/files.po +++ b/l10n/sw_KE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index efa55405965..da407172733 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index a9b2566a89e..511b0ca1133 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "மார்கழி" msgid "Settings" msgstr "அமைப்புகள்" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "செக்கன்களுக்கு முன்" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "இன்று" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "நேற்று" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "கடந்த மாதம்" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "மாதங்களுக்கு முன்" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "கடந்த வருடம்" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "வருடங்களுக்கு முன்" @@ -266,6 +266,46 @@ msgstr "சரி" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index cb81b1d0b54..dd4a7dcf141 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "வட்டில் எழுத முடியவில்லை" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "பதிவேற்றல் தோல்வியுற்றது" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "கோப்புகள்" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL வெறுமையாக இருக்கமுடியாது." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "வழு" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "பகிர்வு" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "பெயர்மாற்றம்" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "நிலுவையிலுள்ள" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ஏற்கனவே உள்ளது" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "மாற்றிடுக" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "பெயரை பரிந்துரைக்க" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "இரத்து செய்க" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "முன் செயல் நீக்கம் " -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "பெயர்" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "அளவு" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "மாற்றப்பட்டது" @@ -232,7 +240,7 @@ msgstr "மாற்றப்பட்டது" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "பதிவேற்றுக" @@ -268,65 +276,65 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி msgid "Save" msgstr "சேமிக்க " -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "புதிய" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "கோப்பு உரை" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "கோப்புறை" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "இணைப்பிலிருந்து" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "பதிவேற்றலை இரத்து செய்க" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "பதிவிறக்குக" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "பகிரப்படாதது" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "நீக்குக" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "பதிவேற்றல் மிகப்பெரியது" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "தற்போது வருடப்படுபவை" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index c7ece05242c..cafed635ec9 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/te/core.po b/l10n/te/core.po index 9c2ae9cdb2d..807fd914571 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "డిసెంబర్" msgid "Settings" msgstr "అమరికలు" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "క్షణాల క్రితం" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ఈరోజు" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "నిన్న" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "పోయిన నెల" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "నెలల క్రితం" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "పోయిన సంవత్సరం" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "సంవత్సరాల క్రితం" @@ -266,6 +266,46 @@ msgstr "సరే" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/te/files.po b/l10n/te/files.po index f414cfe474d..6c0c87d2181 100644 --- a/l10n/te/files.po +++ b/l10n/te/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "పొరపాటు" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "శాశ్వతంగా తొలగించు" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "రద్దుచేయి" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "పేరు" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "పరిమాణం" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "భద్రపరచు" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "సంచయం" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "తొలగించు" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index fae385a6340..b9bb6933e6a 100644 --- a/l10n/te/settings.po +++ b/l10n/te/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b33795587e7..33882c89991 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its " +"name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index eedc0a25df3..93b709990c0 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,11 +75,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -87,144 +91,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index d3bea416f53..30de1ff6de2 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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 e479af01a27..b5ecc6f796e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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 d7f497295db..7524db3041a 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index f64c3dfd3d0..cd6766aee43 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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 b0fc9800d2a..17353203915 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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 d10c7fb9fb3..2202934fcda 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,15 +165,15 @@ msgstr "" msgid "Token expired. Please reload page." msgstr "" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 3d0cbd90cfc..034369deddf 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -108,11 +108,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index cce14efa4e1..1f0ca9c4ef9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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 ea6486423a4..9ea999ee237 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\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/core.po b/l10n/th_TH/core.po index 3ab10d3bf6f..db30ee027ea 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "ธันวาคม" msgid "Settings" msgstr "ตั้งค่า" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "วินาที ก่อนหน้านี้" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "วันนี้" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "เมื่อวานนี้" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "เดือนที่แล้ว" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "เดือน ที่ผ่านมา" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ปีที่แล้ว" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ปี ที่ผ่านมา" @@ -262,6 +262,45 @@ msgstr "ตกลง" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 2bb54ad25e0..c6f59333185 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้ msgid "Not enough storage available" msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "อัพโหลดล้มเหลว" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "ไดเร็กทอรี่ไม่ถูกต้อง" @@ -86,141 +90,145 @@ msgstr "ไดเร็กทอรี่ไม่ถูกต้อง" msgid "Files" msgstr "ไฟล์" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "มีพื้นที่เหลือไม่เพียงพอ" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ไม่สามารถเว้นว่างได้" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ข้อผิดพลาด" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "แชร์" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "เปลี่ยนชื่อ" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "อยู่ระหว่างดำเนินการ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} มีอยู่แล้วในระบบ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "แทนที่" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "แนะนำชื่อ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ยกเลิก" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "เลิกทำ" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "การอัพโหลดไฟล์" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ชื่อ" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ขนาด" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "แก้ไขแล้ว" @@ -229,7 +237,7 @@ msgstr "แก้ไขแล้ว" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "อัพโหลด" @@ -265,65 +273,65 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด" msgid "Save" msgstr "บันทึก" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "อัพโหลดไฟล์ใหม่" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ไฟล์ข้อความ" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "แฟ้มเอกสาร" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "จากลิงก์" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ยกเลิกการอัพโหลด" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ดาวน์โหลด" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ยกเลิกการแชร์" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "ลบ" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index 6c34842bf4b..1b369b9b75b 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index eed4853b177..3c751e4cd35 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "Aralık" msgid "Settings" msgstr "Ayarlar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "saniye önce" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "bugün" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "dün" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "geçen ay" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ay önce" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "geçen yıl" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "yıl önce" @@ -269,6 +269,46 @@ msgstr "Tamam" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/tr/files.po b/l10n/tr/files.po index e4878d5cdee..05c4ef56797 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Diske yazılamadı" msgid "Not enough storage available" msgstr "Yeterli disk alanı yok" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Yükleme başarısız" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Geçersiz dizin." @@ -89,144 +93,148 @@ msgstr "Geçersiz dizin." msgid "Files" msgstr "Dosyalar" -#: js/file-upload.js:11 -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/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Yeterli disk alanı yok" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 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/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL boş olamaz." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Hata" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Paylaş" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Kalıcı olarak sil" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Bekliyor" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "değiştir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Öneri ad" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "iptal" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ismi {old_name} ile değiştirildi" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "geri al" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dizin" msgstr[1] "%n dizin" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n dosya" msgstr[1] "%n dosya" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n dosya yükleniyor" msgstr[1] "%n dosya yükleniyor" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dosyalar yükleniyor" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' geçersiz dosya adı." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Dosya adı boş olamaz." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "İsim" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Boyut" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Değiştirilme" @@ -235,7 +243,7 @@ msgstr "Değiştirilme" msgid "%s could not be renamed" msgstr "%s yeniden adlandırılamadı" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Yükle" @@ -271,65 +279,65 @@ msgstr "ZIP dosyaları için en fazla girdi sayısı" msgid "Save" msgstr "Kaydet" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Yeni" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Metin dosyası" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Klasör" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Bağlantıdan" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Dosyalar silindi" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Buraya erişim hakkınız yok." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "İndir" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Paylaşılmayan" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Sil" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Yükleme çok büyük" -#: templates/index.php:110 +#: templates/index.php:102 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:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 473a8a6790c..8d168dd065d 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 385f716e96f..6078bee4c5f 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "كۆنەك" msgid "Settings" msgstr "تەڭشەكلەر" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "بۈگۈن" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "تۈنۈگۈن" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "جەزملە" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ug/files.po b/l10n/ug/files.po index 3eabab5235b..c029562d869 100644 --- a/l10n/ug/files.po +++ b/l10n/ug/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "دىسكىغا يازالمىدى" msgid "Not enough storage available" msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ھۆججەتلەر" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "يېتەرلىك بوشلۇق يوق" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "يۈكلەشتىن ۋاز كەچتى." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خاتالىق" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ھەمبەھىر" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "مەڭگۈلۈك ئۆچۈر" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "ئات ئۆزگەرت" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "كۈتۈۋاتىدۇ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} مەۋجۇت" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ئالماشتۇر" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "تەۋسىيە ئات" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ۋاز كەچ" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "يېنىۋال" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ھۆججەت يۈكلىنىۋاتىدۇ" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ئاتى" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "چوڭلۇقى" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "ئۆزگەرتكەن" @@ -229,7 +237,7 @@ msgstr "ئۆزگەرتكەن" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "يۈكلە" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "ساقلا" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "يېڭى" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "تېكىست ھۆججەت" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "قىسقۇچ" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "ئۆچۈرۈلگەن ھۆججەتلەر" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "يۈكلەشتىن ۋاز كەچ" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "چۈشۈر" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ھەمبەھىرلىمە" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "ئۆچۈر" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "يۈكلەندىغىنى بەك چوڭ" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 63874495c3b..84bd5ebb2a5 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 888399d1dc7..b30a1633773 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Грудень" msgid "Settings" msgstr "Налаштування" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "секунди тому" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "сьогодні" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчора" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "минулого місяця" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "місяці тому" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "минулого року" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "роки тому" @@ -270,6 +270,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 13cbcf24616..23349e0800d 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: zubr139 \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Невдалося записати на диск" msgid "Not enough storage available" msgstr "Місця більше немає" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Помилка завантаження" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Невірний каталог." @@ -87,147 +91,151 @@ msgstr "Невірний каталог." msgid "Files" msgstr "Файли" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Місця більше немає" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Завантаження перервано." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL не може бути пустим." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Помилка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Поділитися" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Видалити назавжди" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Перейменувати" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Очікування" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} вже існує" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "заміна" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "запропонуйте назву" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "відміна" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "замінено {new_name} на {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "відмінити" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "файли завантажуються" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' це невірне ім'я файлу." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr " Ім'я файлу не може бути порожнім." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше сховище майже повне ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ім'я" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Розмір" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Змінено" @@ -236,7 +244,7 @@ msgstr "Змінено" msgid "%s could not be renamed" msgstr "%s не може бути перейменований" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Вивантажити" @@ -272,65 +280,65 @@ msgstr "Максимальний розмір завантажуємого ZIP msgid "Save" msgstr "Зберегти" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Створити" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстовий файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "З посилання" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Видалено файлів" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Перервати завантаження" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "У вас тут немає прав на запис." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Тут нічого немає. Відвантажте що-небудь!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Завантажити" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Закрити доступ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Видалити" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файл занадто великий" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Файли скануються, зачекайте, будь-ласка." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Поточне сканування" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 53d79864613..a96bef5878c 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 5e22263ec5f..4b4391115ef 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -190,55 +190,55 @@ msgstr "دسمبر" msgid "Settings" msgstr "سیٹینگز" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "اوکے" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po index e92fc72d7f3..2efc8cf7473 100644 --- a/l10n/ur_PK/files.po +++ b/l10n/ur_PK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ایرر" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "شئیرنگ ختم کریں" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 92dc0e5d077..2893f058698 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index 6cdb4d2458e..6d9203adc4b 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,51 +191,51 @@ msgstr "Tháng 12" msgid "Settings" msgstr "Cài đặt" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "vài giây trước" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hôm nay" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hôm qua" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "tháng trước" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "tháng trước" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "năm trước" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "năm trước" @@ -263,6 +263,45 @@ msgstr "Đồng ý" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/vi/files.po b/l10n/vi/files.po index ffc9063f5d7..df0a42f78e5 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Không thể ghi " msgid "Not enough storage available" msgstr "Không đủ không gian lưu trữ" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Tải lên thất bại" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Thư mục không hợp lệ" @@ -87,141 +91,145 @@ msgstr "Thư mục không hợp lệ" msgid "Files" msgstr "Tập tin" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Không đủ chỗ trống cần thiết" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Hủy tải lên" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL không được để trống." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Lỗi" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Chia sẻ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Xóa vĩnh vễn" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Sửa tên" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Đang chờ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} đã tồn tại" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "thay thế" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "tên gợi ý" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "hủy" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "đã thay thế {new_name} bằng {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "lùi lại" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "tệp tin đang được tải lên" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' là một tên file không hợp lệ" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Tên file không được rỗng" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Your storage is full, files can not be updated or synced anymore!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Your storage is almost full ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Tên" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Kích cỡ" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Thay đổi" @@ -230,7 +238,7 @@ msgstr "Thay đổi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Tải lên" @@ -266,65 +274,65 @@ msgstr "Kích thước tối đa cho các tập tin ZIP" msgid "Save" msgstr "Lưu" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Mới" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tập tin văn bản" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Thư mục" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Từ liên kết" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "File đã bị xóa" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Hủy upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Bạn không có quyền ghi vào đây." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Tải về" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Bỏ chia sẻ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Xóa" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Tập tin tải lên quá lớn" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Tập tin đang được quét ,vui lòng chờ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Hiện tại đang quét" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 37f3d2e0da8..a3499595611 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 8d4cdaa172a..50a09f4c32c 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,51 +193,51 @@ msgstr "十二月" msgid "Settings" msgstr "设置" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分钟前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小时前" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今天" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨天" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "上月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 月前" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "去年" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "年前" @@ -265,6 +265,45 @@ msgstr "好" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index e68d22da13a..26678e7a453 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "写入磁盘失败" msgid "Not enough storage available" msgstr "没有足够的存储空间" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "上传失败" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "无效文件夹。" @@ -89,141 +93,145 @@ msgstr "无效文件夹。" msgid "Files" msgstr "文件" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "无法上传您的文件，文件夹或者空文件" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "没有足够可用空间" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "上传已取消" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL不能为空" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "错误" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "永久删除" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "重命名" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "等待" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} 已存在" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "替换" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "建议名称" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "取消" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "已将 {old_name}替换成 {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "撤销" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 文件夹" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n个文件" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "文件上传中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 是一个无效的文件名。" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "文件名不能为空。" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "您的存储空间已满，文件将无法更新或同步！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "您的存储空间即将用完 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "下载正在准备中。如果文件较大可能会花费一些时间。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名称" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "大小" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "修改日期" @@ -232,7 +240,7 @@ msgstr "修改日期" msgid "%s could not be renamed" msgstr "%s 不能被重命名" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上传" @@ -268,65 +276,65 @@ msgstr "ZIP 文件的最大输入大小" msgid "Save" msgstr "保存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新建" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "文本文件" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "文件夹" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "来自链接" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "已删除文件" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "取消上传" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "您没有写权限" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "这里还什么都没有。上传些东西吧！" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下载" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消共享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "删除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "上传文件过大" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "文件正在被扫描，请稍候。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "当前扫描" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 2e9ea7f2a6d..fc3228827b0 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -114,11 +114,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 51efb5c3cf6..edcf03cc9dd 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今日" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨日" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "前一月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "個月之前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index ef901a270fc..20aca3cb37e 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "文件" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "錯誤" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名稱" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上傳" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "儲存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下載" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消分享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "刪除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 03c8c330da4..079b4a52ddf 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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 405447f8111..76b1ce04f5b 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/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: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,51 +192,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "幾秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分鐘前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小時前" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今天" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨天" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "上個月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 個月前" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "幾個月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "去年" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "幾年前" @@ -264,6 +264,45 @@ msgstr "好" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +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." diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index cc65168506e..60f8fdf7a0d 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pellaeon \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "寫入硬碟失敗" msgid "Not enough storage available" msgstr "儲存空間不足" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "上傳失敗" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "無效的資料夾" @@ -87,141 +91,145 @@ msgstr "無效的資料夾" msgid "Files" msgstr "檔案" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "沒有足夠的可用空間" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "上傳已取消" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "檔案上傳中，離開此頁面將會取消上傳。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL 不能為空" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "錯誤" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "永久刪除" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "重新命名" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "等候中" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} 已經存在" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "取代" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "建議檔名" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "取消" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "使用 {new_name} 取代 {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "復原" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 個資料夾" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n 個檔案" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} 和 {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個檔案正在上傳" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "檔案上傳中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 是不合法的檔名" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "檔名不能為空" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名稱" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "大小" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "修改時間" @@ -230,7 +238,7 @@ msgstr "修改時間" msgid "%s could not be renamed" msgstr "無法重新命名 %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上傳" @@ -266,65 +274,65 @@ msgstr "ZIP 壓縮前的原始大小限制" msgid "Save" msgstr "儲存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新增" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "文字檔" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "資料夾" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "從連結" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "回收桶" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "取消上傳" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "您在這裡沒有編輯權" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "這裡還沒有東西，上傳一些吧！" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下載" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消分享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "刪除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "上傳過大" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您試圖上傳的檔案大小超過伺服器的限制。" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "正在掃描檔案，請稍等。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "正在掃描" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index e6f825433a8..5c24961e5cb 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/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: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index da3ec4ce372..ab3d618849e 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Utilisateurs", "Admin" => "Administration", "Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement.", +"Unknown filetype" => "Type de fichier inconnu", +"Invalid image" => "Image invalide", "web services under your control" => "services web sous votre contrôle", "cannot open \"%s\"" => "impossible d'ouvrir \"%s\"", "ZIP download is turned off." => "Téléchargement ZIP désactivé.", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 2dab6dee157..b00789bc86f 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Users" => "Utenti", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".", -"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura.", -"Unknown filetype" => "Tipo file sconosciuto", +"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura", +"Unknown filetype" => "Tipo di file sconosciuto", "Invalid image" => "Immagine non valida", "web services under your control" => "servizi web nelle tue mani", "cannot open \"%s\"" => "impossibile aprire \"%s\"", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index bf540012249..6e2bcba7b10 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "Users" => "Utilizadores", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "A actualização \"%s\" falhou.", +"Unknown filetype" => "Ficheiro desconhecido", +"Invalid image" => "Imagem inválida", "web services under your control" => "serviços web sob o seu controlo", "cannot open \"%s\"" => "Não foi possível abrir \"%s\"", "ZIP download is turned off." => "Descarregamento em ZIP está desligado.", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c3b6a077b72..0fe88efef70 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -1,11 +1,15 @@ "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud.", +"No app name specified" => "Не выбрано имя приложения", "Help" => "Помощь", "Personal" => "Личное", "Settings" => "Конфигурация", "Users" => "Пользователи", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".", +"Unknown filetype" => "Неизвестный тип файла", +"Invalid image" => "Изображение повреждено", "web services under your control" => "веб-сервисы под вашим управлением", "cannot open \"%s\"" => "не могу открыть \"%s\"", "ZIP download is turned off." => "ZIP-скачивание отключено.", @@ -13,6 +17,15 @@ $TRANSLATIONS = array( "Back to Files" => "Назад к файлам", "Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора.", +"No source specified when installing app" => "Не указан источник при установке приложения", +"No href specified when installing app from http" => "Не указан атрибут href при установке приложения через http", +"No path specified when installing app from local file" => "Не указан путь при установке приложения из локального файла", +"Archives of type %s are not supported" => "Архивы %s не поддерживаются", +"Failed to open archive when installing app" => "Не возможно открыть архив при установке приложения", +"App does not provide an info.xml file" => "Приложение не имеет файла info.xml", +"App can't be installed because of not allowed code in the App" => "Приложение невозможно установить. В нем содержится запрещенный код.", +"App can't be installed because it is not compatible with this version of ownCloud" => "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", +"App directory already exists" => "Папка приложения уже существует", "Application is not enabled" => "Приложение не разрешено", "Authentication error" => "Ошибка аутентификации", "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.", diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php index 5ba51bc0ba7..d8fa9289221 100644 --- a/lib/l10n/sr@latin.php +++ b/lib/l10n/sr@latin.php @@ -8,9 +8,15 @@ $TRANSLATIONS = array( "Authentication error" => "Greška pri autentifikaciji", "Files" => "Fajlovi", "Text" => "Tekst", +"seconds ago" => "Pre par sekundi", "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), +"today" => "Danas", +"yesterday" => "juče", "_%n day go_::_%n days ago_" => array("","",""), -"_%n month ago_::_%n months ago_" => array("","","") +"last month" => "prošlog meseca", +"_%n month ago_::_%n months ago_" => array("","",""), +"last year" => "prošle godine", +"years ago" => "pre nekoliko godina" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 7e2ec238465..9873d4d20ac 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s", "Unable to remove user from group %s" => "Nelze odebrat uživatele ze skupiny %s", "Couldn't update app." => "Nelze aktualizovat aplikaci.", +"Wrong password" => "Nesprávné heslo", +"No user supplied" => "Nebyl uveden uživatel", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena", +"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.", +"Unable to change password" => "Změna hesla se nezdařila", "Update to {appversion}" => "Aktualizovat na {appversion}", "Disable" => "Zakázat", "Enable" => "Povolit", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 05c02e530ed..ae2165873ea 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden", "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden", "Couldn't update app." => "Die App konnte nicht aktualisiert werden.", +"Wrong password" => "Falsches Passwort", +"No user supplied" => "Keinen Benutzer übermittelt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", +"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", +"Unable to change password" => "Passwort konnte nicht geändert werden", "Update to {appversion}" => "Aktualisiere zu {appversion}", "Disable" => "Deaktivieren", "Enable" => "Aktivieren", diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php new file mode 100644 index 00000000000..d70f365826c --- /dev/null +++ b/settings/l10n/de_AT.php @@ -0,0 +1,5 @@ + "Deutsch (Österreich)" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php index 45650a3b440..558071b3cbf 100644 --- a/settings/l10n/de_CH.php +++ b/settings/l10n/de_CH.php @@ -39,7 +39,7 @@ $TRANSLATIONS = array( "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden", "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten", "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", -"__language_name__" => "Deutsch (Förmlich: Sie)", +"__language_name__" => "Deutsch (Schweiz)", "Security Warning" => "Sicherheitshinweis", "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.", "Setup Warning" => "Einrichtungswarnung", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 15511569a18..924792aa62b 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden", "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden", "Couldn't update app." => "Die App konnte nicht aktualisiert werden.", +"Wrong password" => "Falsches Passwort", +"No user supplied" => "Keinen Benutzer übermittelt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", +"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", +"Unable to change password" => "Passwort konnte nicht geändert werden", "Update to {appversion}" => "Update zu {appversion}", "Disable" => "Deaktivieren", "Enable" => "Aktivieren", diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php index edac1152100..abbc92709e5 100644 --- a/settings/l10n/en_GB.php +++ b/settings/l10n/en_GB.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Unable to add user to group %s", "Unable to remove user from group %s" => "Unable to remove user from group %s", "Couldn't update app." => "Couldn't update app.", +"Wrong password" => "Incorrect password", +"No user supplied" => "No user supplied", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Please provide an admin recovery password, otherwise all user data will be lost", +"Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.", +"Unable to change password" => "Unable to change password", "Update to {appversion}" => "Update to {appversion}", "Disable" => "Disable", "Enable" => "Enable", @@ -47,7 +53,7 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.", "Please double check the installation guides." => "Please double check the installation guides.", "Module 'fileinfo' missing" => "Module 'fileinfo' missing", -"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "Locale not working" => "Locale not working", "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.", "Internet connection not working" => "Internet connection not working", @@ -76,7 +82,7 @@ $TRANSLATIONS = array( "More" => "More", "Less" => "Less", "Version" => "Version", -"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Developed by the ownCloud community, the source code is licensed under the AGPL.", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Developed by the ownCloud community, the source code is licensed under the AGPL.", "Add your App" => "Add your App", "More Apps" => "More Apps", "Select an App" => "Select an App", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 027bd23c3e1..b20a4acb299 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s", "Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s", "Couldn't update app." => "No se pudo actualizar la aplicacion.", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario", +"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", +"Unable to change password" => "No se ha podido cambiar la contraseña", "Update to {appversion}" => "Actualizado a {appversion}", "Disable" => "Desactivar", "Enable" => "Activar", @@ -27,6 +30,7 @@ $TRANSLATIONS = array( "Error" => "Error", "Update" => "Actualizar", "Updated" => "Actualizado", +"Select a profile picture" => "Seleccionar una imagen de perfil", "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.", "Saving..." => "Guardando...", "deleted" => "Eliminado", @@ -101,7 +105,11 @@ $TRANSLATIONS = array( "Your email address" => "Su dirección de correo", "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña", "Profile picture" => "Foto del perfil", +"Upload new" => "Subir nuevo", +"Select new from Files" => "Seleccionar nuevo desde Ficheros", +"Remove image" => "Borrar imagen", "Abort" => "Abortar", +"Choose as profile image" => "Seleccionar como imagen de perfil", "Language" => "Idioma", "Help translate" => "Ayúdanos a traducir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 0a1b66e6ae6..a93ea817422 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s", "Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s", "Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.", +"Wrong password" => "Vale parool", +"No user supplied" => "Kasutajat ei sisestatud", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed", +"Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.", +"Unable to change password" => "Ei suuda parooli muuta", "Update to {appversion}" => "Uuenda versioonile {appversion}", "Disable" => "Lülita välja", "Enable" => "Lülita sisse", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 81ec9b483e9..d50dc87e014 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu", "Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu", "Couldn't update app." => "Sovelluksen päivitys epäonnistui.", +"Wrong password" => "Väärä salasana", +"Unable to change password" => "Salasanan vaihto ei onnistunut", "Update to {appversion}" => "Päivitä versioon {appversion}", "Disable" => "Poista käytöstä", "Enable" => "Käytä", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 6b1a829435c..55c0e7fe9a8 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s", "Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s", "Couldn't update app." => "Impossible de mettre à jour l'application", +"Wrong password" => "Mot de passe incorrect", +"No user supplied" => "Aucun utilisateur fourni", +"Unable to change password" => "Impossible de modifier le mot de passe", "Update to {appversion}" => "Mettre à jour vers {appversion}", "Disable" => "Désactiver", "Enable" => "Activer", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index e2537255fc8..62a2f7b8739 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s", "Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s", "Couldn't update app." => "Non foi posíbel actualizar o aplicativo.", +"Wrong password" => "Contrasinal incorrecto", +"No user supplied" => "Non subministrado polo usuario", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario", +"Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.", +"Unable to change password" => "Non é posíbel cambiar o contrasinal", "Update to {appversion}" => "Actualizar á {appversion}", "Disable" => "Desactivar", "Enable" => "Activar", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index b06fc2a0f67..fc91bc5f170 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s", "Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s", "Couldn't update app." => "Impossibile aggiornate l'applicazione.", +"Wrong password" => "Password errata", +"No user supplied" => "Non è stato fornito alcun utente", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.", +"Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", +"Unable to change password" => "Impossibile cambiare la password", "Update to {appversion}" => "Aggiorna a {appversion}", "Disable" => "Disabilita", "Enable" => "Abilita", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index 7d36468e1a5..6f3312fa78b 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s", "Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s", "Couldn't update app." => "Não foi possível atualizar a app.", +"Wrong password" => "Senha errada", +"No user supplied" => "Nenhum usuário fornecido", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos", +"Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....", +"Unable to change password" => "Impossível modificar senha", "Update to {appversion}" => "Atualizar para {appversion}", "Disable" => "Desabilitar", "Enable" => "Habilitar", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index cf0e66a24da..b664d2be3db 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -101,6 +101,7 @@ $TRANSLATIONS = array( "Your email address" => "O seu endereço de email", "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave", "Profile picture" => "Foto do perfil", +"Abort" => "Abortar", "Language" => "Idioma", "Help translate" => "Ajude a traduzir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 40dbbd45009..7bcceb8b905 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -16,15 +16,21 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s", "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Couldn't update app." => "Невозможно обновить приложение", +"Wrong password" => "Неправильный пароль", +"Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.", +"Unable to change password" => "Невозможно изменить пароль", "Update to {appversion}" => "Обновить до {версия приложения}", "Disable" => "Выключить", "Enable" => "Включить", "Please wait...." => "Подождите...", +"Error while disabling app" => "Ошибка отключения приложения", +"Error while enabling app" => "Ошибка включения приложения", "Updating...." => "Обновление...", "Error while updating app" => "Ошибка при обновлении приложения", "Error" => "Ошибка", "Update" => "Обновить", "Updated" => "Обновлено", +"Select a profile picture" => "Выберите картинку профиля", "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.", "Saving..." => "Сохранение...", "deleted" => "удален", @@ -99,11 +105,20 @@ $TRANSLATIONS = array( "Your email address" => "Ваш адрес электронной почты", "Fill in an email address to enable password recovery" => "Введите адрес электронной почты чтобы появилась возможность восстановления пароля", "Profile picture" => "Фото профиля", +"Upload new" => "Закачать новую", +"Select new from Files" => "Выберите новый из файлов", +"Remove image" => "Удалить изображение", +"Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.", +"Abort" => "Отмена", +"Choose as profile image" => "Выберите изображение профиля", "Language" => "Язык", "Help translate" => "Помочь с переводом", "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - ", "Encryption" => "Шифрование", +"The encryption app is no longer enabled, decrypt all your file" => "Приложение шифрования не активно, отмените шифрование всех ваших файлов.", +"Log-in password" => "Пароль входа", +"Decrypt all Files" => "Снять шифрование со всех файлов", "Login Name" => "Имя пользователя", "Create" => "Создать", "Admin Recovery Password" => "Восстановление Пароля Администратора", diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php index f23e665bb27..b89f710c280 100644 --- a/settings/l10n/sr@latin.php +++ b/settings/l10n/sr@latin.php @@ -3,8 +3,10 @@ $TRANSLATIONS = array( "Authentication error" => "Greška pri autentifikaciji", "Language changed" => "Jezik je izmenjen", "Invalid request" => "Neispravan zahtev", +"Error" => "Greška", "Groups" => "Grupe", "Delete" => "Obriši", +"Security Warning" => "Bezbednosno upozorenje", "Select an App" => "Izaberite program", "Password" => "Lozinka", "Unable to change your password" => "Ne mogu da izmenim vašu lozinku", -- cgit v1.2.3 From e3013c580108e6b0cc332ba14976f3ffb4b7b274 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 17:34:33 +0200 Subject: Add Navigation class to server container --- lib/app.php | 31 ++++++++----------- lib/navigationmanager.php | 63 +++++++++++++++++++++++++++++++++++++++ lib/public/inavigationmanager.php | 27 +++++++++++++++++ lib/public/iservercontainer.php | 5 ++++ lib/server.php | 10 +++++++ 5 files changed, 117 insertions(+), 19 deletions(-) create mode 100644 lib/navigationmanager.php create mode 100644 lib/public/inavigationmanager.php (limited to 'lib') diff --git a/lib/app.php b/lib/app.php index d98af2dc296..0ab1ee57f63 100644 --- a/lib/app.php +++ b/lib/app.php @@ -27,8 +27,6 @@ * upgrading and removing apps. */ class OC_App{ - static private $activeapp = ''; - static private $navigation = array(); static private $settingsForms = array(); static private $adminForms = array(); static private $personalForms = array(); @@ -271,7 +269,7 @@ class OC_App{ /** * @brief adds an entry to the navigation - * @param string $data array containing the data + * @param array $data array containing the data * @return bool * * This function adds a new entry to the navigation visible to users. $data @@ -287,11 +285,7 @@ class OC_App{ * the navigation. Lower values come first. */ public static function addNavigationEntry( $data ) { - $data['active']=false; - if(!isset($data['icon'])) { - $data['icon']=''; - } - OC_App::$navigation[] = $data; + OC::$server->getNavigationManager()->add($data); return true; } @@ -305,9 +299,7 @@ class OC_App{ * highlighting the current position of the user. */ public static function setActiveNavigationEntry( $id ) { - // load all the apps, to make sure we have all the navigation entries - self::loadApps(); - self::$activeapp = $id; + OC::$server->getNavigationManager()->setActiveEntry($id); return true; } @@ -315,15 +307,14 @@ class OC_App{ * @brief Get the navigation entries for the $app * @param string $app app * @return array of the $data added with addNavigationEntry + * + * Warning: destroys the existing entries */ public static function getAppNavigationEntries($app) { if(is_file(self::getAppPath($app).'/appinfo/app.php')) { - $save = self::$navigation; - self::$navigation = array(); + OC::$server->getNavigationManager()->clear(); require $app.'/appinfo/app.php'; - $app_entries = self::$navigation; - self::$navigation = $save; - return $app_entries; + return OC::$server->getNavigationManager()->getAll(); } return array(); } @@ -336,7 +327,7 @@ class OC_App{ * setActiveNavigationEntry */ public static function getActiveNavigationEntry() { - return self::$activeapp; + return OC::$server->getNavigationManager()->getActiveEntry(); } /** @@ -419,8 +410,9 @@ class OC_App{ // This is private as well. It simply works, so don't ask for more details private static function proceedNavigation( $list ) { + $activeapp = OC::$server->getNavigationManager()->getActiveEntry(); foreach( $list as &$naventry ) { - if( $naventry['id'] == self::$activeapp ) { + if( $naventry['id'] == $activeapp ) { $naventry['active'] = true; } else{ @@ -572,7 +564,8 @@ class OC_App{ * - active: boolean, signals if the user is on this navigation entry */ public static function getNavigation() { - $navigation = self::proceedNavigation( self::$navigation ); + $entries = OC::$server->getNavigationManager()->getAll(); + $navigation = self::proceedNavigation( $entries ); return $navigation; } diff --git a/lib/navigationmanager.php b/lib/navigationmanager.php new file mode 100644 index 00000000000..f032afd1fc4 --- /dev/null +++ b/lib/navigationmanager.php @@ -0,0 +1,63 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ + +namespace OC; + +/** + * Manages the owncloud navigation + */ +class NavigationManager { + protected $entries = array(); + + /** + * Creates a new navigation entry + * @param array $entry containing: id, name, order, icon and href key + */ + public function add(array $entry) { + $entry['active'] = false; + if(!isset($entry['icon'])) { + $entry['icon'] = ''; + } + $this->entries[] = $entry; + } + + /** + * @brief returns all the added Menu entries + * @return array of the added entries + */ + public function getAll() { + return $this->entries; + } + + /** + * @brief removes all the entries + */ + public function clear() { + $this->entries = array(); + } + + /** + * Sets the current navigation entry of the currently running app + * @param string $id of the app entry to activate (from added $entry) + */ + public function setActiveEntry($id) { + $this->activeEntry = $id; + } + + /** + * @brief gets the active Menu entry + * @return string id or empty string + * + * This function returns the id of the active navigation entry (set by + * setActiveEntry + */ + public function getActiveEntry() { + return $this->activeEntry; + } +} diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php new file mode 100644 index 00000000000..21744dd1c21 --- /dev/null +++ b/lib/public/inavigationmanager.php @@ -0,0 +1,27 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ + +namespace OCP; + +/** + * Manages the owncloud navigation + */ +interface INavigationManager { + /** + * Creates a new navigation entry + * @param array $entry containing: id, name, order, icon and href key + */ + public function add(array $entry); + + /** + * Sets the current navigation entry of the currently running app + * @param string $appId id of the app entry to activate (from added $entry) + */ + public function setActiveEntry($appId); +} \ No newline at end of file diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 5481cd6ce6a..ebcc0fe4cd4 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -69,6 +69,11 @@ interface IServerContainer { */ function getUserSession(); + /** + * @return \OCP\INavigationManager + */ + function getNavigationManager(); + /** * Returns an ICache instance * diff --git a/lib/server.php b/lib/server.php index a5288fa1482..13bda2dc30d 100644 --- a/lib/server.php +++ b/lib/server.php @@ -97,6 +97,9 @@ class Server extends SimpleContainer implements IServerContainer { }); return $userSession; }); + $this->registerService('NavigationManager', function($c) { + return new \OC\NavigationManager(); + }); $this->registerService('UserCache', function($c) { return new UserCache(); }); @@ -152,6 +155,13 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('UserSession'); } + /** + * @return \OC\NavigationManager + */ + function getNavigationManager() { + return $this->query('NavigationManager'); + } + /** * Returns an ICache instance * -- cgit v1.2.3 From e92abfd4d8dfb9dbb42ccfc0c23193b1ddde3bbf Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 20:21:24 +0200 Subject: Add Config container class to server container --- lib/allconfig.php | 78 +++++++++++++++++++++++++++++++++++++++++ lib/public/iconfig.php | 59 +++++++++++++++++++++++++++++++ lib/public/iservercontainer.php | 5 +++ lib/server.php | 9 +++++ 4 files changed, 151 insertions(+) create mode 100644 lib/allconfig.php create mode 100644 lib/public/iconfig.php (limited to 'lib') diff --git a/lib/allconfig.php b/lib/allconfig.php new file mode 100644 index 00000000000..81c8892348b --- /dev/null +++ b/lib/allconfig.php @@ -0,0 +1,78 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ + +namespace OC; + +/** + * Class to combine all the configuration options ownCloud offers + */ +class AllConfig implements \OCP\IConfig { + /** + * Sets a new systemwide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + * @todo need a use case for this + */ +// public function setSystemValue($key, $value) { +// \OCP\Config::setSystemValue($key, $value); +// } + + /** + * Looks up a systemwide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getSystemValue($key) { + return \OCP\Config::getSystemValue($key, ''); + } + + + /** + * Writes a new appwide value + * @param string $appName the appName that we want to store the value under + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + public function setAppValue($appName, $key, $value) { + \OCP\Config::setAppValue($appName, $key, $value); + } + + /** + * Looks up an appwide defined value + * @param string $appName the appName that we stored the value under + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getAppValue($appName, $key) { + return \OCP\Config::getAppValue($appName, $key, ''); + } + + + /** + * Set a user defined value + * @param string $userId the userId of the user that we want to store the value under + * @param string $appName the appName that we want to store the value under + * @param string $key the key under which the value is being stored + * @param string $value the value that you want to store + */ + public function setUserValue($userId, $appName, $key, $value) { + \OCP\Config::setUserValue($userId, $appName, $key, $value); + } + + + /** + * Shortcut for getting a user defined value + * @param string $userId the userId of the user that we want to store the value under + * @param string $appName the appName that we stored the value under + * @param string $key the key under which the value is being stored + */ + public function getUserValue($userId, $appName, $key){ + return \OCP\Config::getUserValue($userId, $appName, $key); + } +} diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php new file mode 100644 index 00000000000..0c150ec351a --- /dev/null +++ b/lib/public/iconfig.php @@ -0,0 +1,59 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + * + */ +namespace OCP; + +/** + * Access to all the configuration options ownCloud offers + */ +interface IConfig { + /** + * Sets a new systemwide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + * @todo need a use case for this + */ +// public function setSystemValue($key, $value); + + /** + * Looks up a systemwide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getSystemValue($key); + + + /** + * Writes a new appwide value + * @param string $key the key of the value, under which will be saved + * @param string $value the value that should be stored + */ + public function setAppValue($key, $value, $appName=null); + + /** + * Looks up an appwide defined value + * @param string $key the key of the value, under which it was saved + * @return string the saved value + */ + public function getAppValue($key, $appName=null); + + + /** + * Shortcut for setting a user defined value + * @param string $key the key under which the value is being stored + * @param string $value the value that you want to store + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + public function setUserValue($key, $value, $userId=null); + + /** + * Shortcut for getting a user defined value + * @param string $key the key under which the value is being stored + * @param string $userId the userId of the user that we want to store the value under, defaults to the current one + */ + public function getUserValue($key, $userId=null); +} diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index ebcc0fe4cd4..4478a4e8a6c 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -74,6 +74,11 @@ interface IServerContainer { */ function getNavigationManager(); + /** + * @return \OCP\IConfig + */ + function getConfig(); + /** * Returns an ICache instance * diff --git a/lib/server.php b/lib/server.php index 13bda2dc30d..57e7f4ab4f1 100644 --- a/lib/server.php +++ b/lib/server.php @@ -100,6 +100,9 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('NavigationManager', function($c) { return new \OC\NavigationManager(); }); + $this->registerService('AllConfig', function($c) { + return new \OC\AllConfig(); + }); $this->registerService('UserCache', function($c) { return new UserCache(); }); @@ -162,6 +165,12 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('NavigationManager'); } + /** + * @return \OC\Config + */ + function getConfig() { + return $this->query('AllConfig'); + } /** * Returns an ICache instance * -- cgit v1.2.3 From d84d548618651c0a66bd2696d6547b33ca6b8e87 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 20:34:17 +0200 Subject: when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy --- lib/files/cache/scanner.php | 2 ++ tests/lib/files/cache/scanner.php | 1 + 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index fdbce0d51fe..d296c606865 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -121,6 +121,8 @@ class Scanner extends BasicEmitter { } $parentCacheData = $this->cache->get($parent); $parentCacheData['etag'] = $this->storage->getETag($parent); + // the boolean to int conversion is necessary to make pg happy + $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0; $this->cache->put($parent, $parentCacheData); } } diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index b137799bbcf..8112eada17c 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -195,6 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase { $data1 = $this->cache->get('folder'); $data2 = $this->cache->get(''); $data0['etag'] = ''; + $data0['encrypted'] = $data0['encrypted'] ? 1: 0; $this->cache->put('folder/bar.txt', $data0); // rescan -- cgit v1.2.3 From 9116303cfc5259f05ec348809bfbc8757d4657cb Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 21:40:54 +0200 Subject: fixing typos --- lib/allconfig.php | 8 ++++---- lib/public/iconfig.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/allconfig.php b/lib/allconfig.php index 81c8892348b..353608e5d21 100644 --- a/lib/allconfig.php +++ b/lib/allconfig.php @@ -14,7 +14,7 @@ namespace OC; */ class AllConfig implements \OCP\IConfig { /** - * Sets a new systemwide value + * Sets a new system wide value * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored * @todo need a use case for this @@ -24,7 +24,7 @@ class AllConfig implements \OCP\IConfig { // } /** - * Looks up a systemwide defined value + * Looks up a system wide defined value * @param string $key the key of the value, under which it was saved * @return string the saved value */ @@ -34,7 +34,7 @@ class AllConfig implements \OCP\IConfig { /** - * Writes a new appwide value + * Writes a new app wide value * @param string $appName the appName that we want to store the value under * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored @@ -44,7 +44,7 @@ class AllConfig implements \OCP\IConfig { } /** - * Looks up an appwide defined value + * Looks up an app wide defined value * @param string $appName the appName that we stored the value under * @param string $key the key of the value, under which it was saved * @return string the saved value diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php index 0c150ec351a..dab4590969b 100644 --- a/lib/public/iconfig.php +++ b/lib/public/iconfig.php @@ -12,7 +12,7 @@ namespace OCP; */ interface IConfig { /** - * Sets a new systemwide value + * Sets a new system wide value * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored * @todo need a use case for this @@ -20,7 +20,7 @@ interface IConfig { // public function setSystemValue($key, $value); /** - * Looks up a systemwide defined value + * Looks up a system wide defined value * @param string $key the key of the value, under which it was saved * @return string the saved value */ @@ -28,14 +28,14 @@ interface IConfig { /** - * Writes a new appwide value + * Writes a new app wide value * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored */ public function setAppValue($key, $value, $appName=null); /** - * Looks up an appwide defined value + * Looks up an app wide defined value * @param string $key the key of the value, under which it was saved * @return string the saved value */ -- cgit v1.2.3 From e31f6c01e85bea52e973df65a7610d490bf6336c Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 21:43:17 +0200 Subject: fixing PHPDoc --- lib/public/app.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/public/app.php b/lib/public/app.php index a1ecf524cc8..0a5721b334e 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -35,10 +35,10 @@ namespace OCP; */ class App { /** - * @brief Makes owncloud aware of this app + * @brief Makes ownCloud aware of this app * @brief This call is deprecated and not necessary to use. * @param $data array with all information - * @returns true/false + * @returns boolean * * @deprecated this method is deprecated * Do not call it anymore @@ -52,7 +52,7 @@ class App { /** * @brief adds an entry to the navigation * @param $data array containing the data - * @returns true/false + * @returns boolean * * This function adds a new entry to the navigation visible to users. $data * is an associative array. @@ -72,8 +72,8 @@ class App { /** * @brief marks a navigation entry as active - * @param $id id of the entry - * @returns true/false + * @param $id string id of the entry + * @returns boolean * * This function sets a navigation entry as active and removes the 'active' * property from all other entries. The templates can use this for @@ -104,7 +104,7 @@ class App { /** * @brief Read app metadata from the info.xml file * @param string $app id of the app or the path of the info.xml file - * @param boolean path (optional) + * @param boolean $path (optional) * @returns array */ public static function getAppInfo( $app, $path=false ) { @@ -114,7 +114,7 @@ class App { /** * @brief checks whether or not an app is enabled * @param $app app - * @returns true/false + * @returns boolean * * This function checks whether or not an app is enabled. */ @@ -133,7 +133,7 @@ class App { /** * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml * @param $app app - * @returns true/false + * @returns boolean */ public static function getAppVersion( $app ) { return \OC_App::getAppVersion( $app ); -- cgit v1.2.3 From f83f32326949d6bc16c2b0d7aefcdbb48f9119d7 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 21:45:27 +0200 Subject: fixing typos + adding missing filed $activeEntry --- lib/navigationmanager.php | 3 ++- lib/public/inavigationmanager.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/navigationmanager.php b/lib/navigationmanager.php index f032afd1fc4..cf3bf84d998 100644 --- a/lib/navigationmanager.php +++ b/lib/navigationmanager.php @@ -10,10 +10,11 @@ namespace OC; /** - * Manages the owncloud navigation + * Manages the ownCloud navigation */ class NavigationManager { protected $entries = array(); + protected $activeEntry; /** * Creates a new navigation entry diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php index 21744dd1c21..f89e790c1d0 100644 --- a/lib/public/inavigationmanager.php +++ b/lib/public/inavigationmanager.php @@ -10,7 +10,7 @@ namespace OCP; /** - * Manages the owncloud navigation + * Manages the ownCloud navigation */ interface INavigationManager { /** @@ -24,4 +24,4 @@ interface INavigationManager { * @param string $appId id of the app entry to activate (from added $entry) */ public function setActiveEntry($appId); -} \ No newline at end of file +} -- cgit v1.2.3 From d3d52dd23f3da9a3d9ed2b50b1abd1a229dc4be8 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 21:57:48 +0200 Subject: PHPDoc & get UserManager from container for RooFolder --- lib/server.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 57e7f4ab4f1..804af6b0eac 100644 --- a/lib/server.php +++ b/lib/server.php @@ -4,6 +4,7 @@ namespace OC; use OC\AppFramework\Http\Request; use OC\AppFramework\Utility\SimpleContainer; +use OC\Cache\UserCache; use OC\Files\Node\Root; use OC\Files\View; use OCP\IServerContainer; @@ -49,9 +50,11 @@ class Server extends SimpleContainer implements IServerContainer { return new PreviewManager(); }); $this->registerService('RootFolder', function($c) { - // TODO: get user and user manager from container as well + // TODO: get user from container as well $user = \OC_User::getUser(); - $user = \OC_User::getManager()->get($user); + /** @var $c SimpleContainer */ + $userManager = $c->query('UserManager'); + $user = $userManager->get($user); $manager = \OC\Files\Filesystem::getMountManager(); $view = new View(); return new Root($manager, $view, $user); @@ -60,6 +63,7 @@ class Server extends SimpleContainer implements IServerContainer { return new \OC\User\Manager(); }); $this->registerService('UserSession', function($c) { + /** @var $c SimpleContainer */ $manager = $c->query('UserManager'); $userSession = new \OC\User\Session($manager, \OC::$session); $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { -- cgit v1.2.3 From 0c6dcdba6b890dc170f59a461ab80961a85a53db Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 22:45:22 +0200 Subject: Add missing implements and fix parameters in IConfig --- lib/allconfig.php | 1 - lib/navigationmanager.php | 2 +- lib/public/iconfig.php | 22 ++++++++++++++-------- lib/public/idbconnection.php | 3 +++ lib/user/session.php | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/allconfig.php b/lib/allconfig.php index 353608e5d21..72aabf60793 100644 --- a/lib/allconfig.php +++ b/lib/allconfig.php @@ -65,7 +65,6 @@ class AllConfig implements \OCP\IConfig { \OCP\Config::setUserValue($userId, $appName, $key, $value); } - /** * Shortcut for getting a user defined value * @param string $userId the userId of the user that we want to store the value under diff --git a/lib/navigationmanager.php b/lib/navigationmanager.php index cf3bf84d998..1f657b9ad80 100644 --- a/lib/navigationmanager.php +++ b/lib/navigationmanager.php @@ -12,7 +12,7 @@ namespace OC; /** * Manages the ownCloud navigation */ -class NavigationManager { +class NavigationManager implements \OCP\INavigationManager { protected $entries = array(); protected $activeEntry; diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php index dab4590969b..850bddf6935 100644 --- a/lib/public/iconfig.php +++ b/lib/public/iconfig.php @@ -1,10 +1,12 @@ +/** + * Copyright (c) 2013 Bart Visscher * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. * */ + namespace OCP; /** @@ -29,31 +31,35 @@ interface IConfig { /** * Writes a new app wide value + * @param string $appName the appName that we want to store the value under * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored */ - public function setAppValue($key, $value, $appName=null); + public function setAppValue($appName, $key, $value); /** * Looks up an app wide defined value + * @param string $appName the appName that we stored the value under * @param string $key the key of the value, under which it was saved * @return string the saved value */ - public function getAppValue($key, $appName=null); + public function getAppValue($appName, $key); /** - * Shortcut for setting a user defined value + * Set a user defined value + * @param string $userId the userId of the user that we want to store the value under + * @param string $appName the appName that we want to store the value under * @param string $key the key under which the value is being stored * @param string $value the value that you want to store - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one */ - public function setUserValue($key, $value, $userId=null); + public function setUserValue($userId, $appName, $key, $value); /** * Shortcut for getting a user defined value + * @param string $userId the userId of the user that we want to store the value under + * @param string $appName the appName that we stored the value under * @param string $key the key under which the value is being stored - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one */ - public function getUserValue($key, $userId=null); + public function getUserValue($userId, $appName, $key); } diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php index 67dd7ccfc37..c741a0f061a 100644 --- a/lib/public/idbconnection.php +++ b/lib/public/idbconnection.php @@ -50,16 +50,19 @@ interface IDBConnection { /** * @brief Start a transaction + * @return bool TRUE on success or FALSE on failure */ public function beginTransaction(); /** * @brief Commit the database changes done during a transaction that is in progress + * @return bool TRUE on success or FALSE on failure */ public function commit(); /** * @brief Rollback the database changes done during a transaction that is in progress + * @return bool TRUE on success or FALSE on failure */ public function rollBack(); diff --git a/lib/user/session.php b/lib/user/session.php index 9a6c669e935..98a24d5bb00 100644 --- a/lib/user/session.php +++ b/lib/user/session.php @@ -27,7 +27,7 @@ use OC\Hooks\Emitter; * * @package OC\User */ -class Session implements Emitter { +class Session implements Emitter, \OCP\IUserSession { /** * @var \OC\User\Manager $manager */ -- cgit v1.2.3 From a2f82da572eaf9cebfe4de53b329af700d63e93f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 20 Sep 2013 23:52:05 +0200 Subject: Use update() instead of put(). --- lib/files/cache/scanner.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index d296c606865..3f1970fb4a2 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -121,9 +121,7 @@ class Scanner extends BasicEmitter { } $parentCacheData = $this->cache->get($parent); $parentCacheData['etag'] = $this->storage->getETag($parent); - // the boolean to int conversion is necessary to make pg happy - $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0; - $this->cache->put($parent, $parentCacheData); + $this->cache->update($parentCacheData['fileid'], $parentCacheData); } } } -- cgit v1.2.3 From 011bca7b7f0a67c9cf23773b625ee334db1e6c06 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 20 Sep 2013 23:53:02 +0200 Subject: Only update the etag. Do not re-submit any other unchanged data. --- lib/files/cache/scanner.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 3f1970fb4a2..fcb8ccdc8d5 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -120,8 +120,9 @@ class Scanner extends BasicEmitter { $parent = ''; } $parentCacheData = $this->cache->get($parent); - $parentCacheData['etag'] = $this->storage->getETag($parent); - $this->cache->update($parentCacheData['fileid'], $parentCacheData); + $this->cache->update($parentCacheData['fileid'], array( + 'etag' => $this->storage->getETag($parent), + )); } } } -- cgit v1.2.3 From 2a17025d537c41b9366c9592c985b911d9394337 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 21 Sep 2013 02:20:01 +0200 Subject: Move bool to int conversion to buildParts(), so it also happens for update(). --- lib/files/cache/cache.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 39e36684b7b..e69733727af 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -201,7 +201,6 @@ class Cache { $data['path'] = $file; $data['parent'] = $this->getParentId($file); $data['name'] = \OC_Util::basename($file); - $data['encrypted'] = isset($data['encrypted']) ? ((int)$data['encrypted']) : 0; list($queryParts, $params) = $this->buildParts($data); $queryParts[] = '`storage`'; @@ -265,6 +264,9 @@ class Cache { $params[] = $value; $queryParts[] = '`mtime`'; } + } elseif ($name === 'encrypted') { + // Boolean to integer conversion + $value = $value ? 1 : 0; } $params[] = $value; $queryParts[] = '`' . $name . '`'; -- cgit v1.2.3 From a1d4eb1f956148fe9002dd17bdfef3bd66063bf0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 22 Sep 2013 01:23:18 +0200 Subject: files: when filtering search results, ensure results are children of the fakeroot not just path starting the same --- lib/files/view.php | 14 ++++++++------ tests/lib/files/view.php | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/files/view.php b/lib/files/view.php index 968b755a661..aa08a5f7cc9 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -500,7 +500,7 @@ class View { } else { if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) { $result = $this->mkdir($path2); - if(is_resource($dh)) { + if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file)) { $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); @@ -975,7 +975,7 @@ class View { /** * search for files by mimetype * - * @param string $query + * @param string $mimetype * @return array */ public function searchByMime($mimetype) { @@ -998,7 +998,7 @@ class View { $results = $cache->$method($query); foreach ($results as $result) { - if (substr($mountPoint . $result['path'], 0, $rootLength) === $this->fakeRoot) { + if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') { $result['path'] = substr($mountPoint . $result['path'], $rootLength); $files[] = $result; } @@ -1012,9 +1012,11 @@ class View { $relativeMountPoint = substr($mountPoint, $rootLength); $results = $cache->$method($query); - foreach ($results as $result) { - $result['path'] = $relativeMountPoint . $result['path']; - $files[] = $result; + if ($results) { + foreach ($results as $result) { + $result['path'] = $relativeMountPoint . $result['path']; + $files[] = $result; + } } } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 0de436f570a..3043f132b73 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -354,8 +354,22 @@ class View extends \PHPUnit_Framework_TestCase { $this->hookPath = $params['path']; } + public function testSearchNotOutsideView() { + $storage1 = $this->getTestStorage(); + \OC\Files\Filesystem::mount($storage1, array(), '/'); + $storage1->rename('folder', 'foo'); + $scanner = $storage1->getScanner(); + $scanner->scan(''); + + $view = new \OC\Files\View('/foo'); + + $result = $view->search('.txt'); + $this->assertCount(1, $result); + } + /** * @param bool $scan + * @param string $class * @return \OC\Files\Storage\Storage */ private function getTestStorage($scan = true, $class = '\OC\Files\Storage\Temporary') { -- cgit v1.2.3 From 28918d61d2375e879fdba582b8ab2f9377ff7a24 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 22 Sep 2013 12:58:42 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/de.php | 5 ++++ apps/files/l10n/de_DE.php | 5 ++++ apps/files/l10n/fi_FI.php | 3 +++ apps/files/l10n/it.php | 5 ++++ apps/files/l10n/pt_BR.php | 5 ++++ apps/files/l10n/ro.php | 12 +++++++--- apps/files/l10n/ru.php | 5 ++++ apps/files_trashbin/l10n/ro.php | 4 ++-- apps/user_ldap/l10n/ru.php | 7 ++++++ core/l10n/ar.php | 3 +++ core/l10n/bg_BG.php | 1 + core/l10n/bn_BD.php | 1 + core/l10n/ca.php | 10 +++++++- core/l10n/cs_CZ.php | 1 + core/l10n/cy_GB.php | 1 + core/l10n/da.php | 1 + core/l10n/de.php | 10 +++++++- core/l10n/de_CH.php | 1 + core/l10n/de_DE.php | 10 +++++++- core/l10n/el.php | 1 + core/l10n/en_GB.php | 1 + core/l10n/eo.php | 1 + core/l10n/es.php | 1 + core/l10n/es_AR.php | 1 + core/l10n/et_EE.php | 1 + core/l10n/eu.php | 1 + core/l10n/fa.php | 1 + core/l10n/fi_FI.php | 4 ++++ core/l10n/fr.php | 1 + core/l10n/gl.php | 1 + core/l10n/he.php | 1 + core/l10n/hr.php | 1 + core/l10n/hu_HU.php | 1 + core/l10n/ia.php | 1 + core/l10n/id.php | 1 + core/l10n/is.php | 1 + core/l10n/it.php | 16 +++++++++---- core/l10n/ja_JP.php | 1 + core/l10n/ka_GE.php | 1 + core/l10n/ko.php | 1 + core/l10n/lb.php | 1 + core/l10n/lt_LT.php | 1 + core/l10n/lv.php | 1 + core/l10n/mk.php | 1 + core/l10n/ms_MY.php | 1 + core/l10n/my_MM.php | 1 + core/l10n/nb_NO.php | 1 + core/l10n/nl.php | 1 + core/l10n/nn_NO.php | 1 + core/l10n/oc.php | 1 + core/l10n/pa.php | 1 + core/l10n/pl.php | 1 + core/l10n/pt_BR.php | 10 +++++++- core/l10n/pt_PT.php | 1 + core/l10n/ro.php | 14 ++++++++--- core/l10n/ru.php | 18 ++++++++++++++- core/l10n/si_LK.php | 1 + core/l10n/sk_SK.php | 1 + core/l10n/sl.php | 1 + core/l10n/sq.php | 1 + core/l10n/sr.php | 1 + core/l10n/sr@latin.php | 1 + core/l10n/sv.php | 1 + core/l10n/ta_LK.php | 1 + core/l10n/te.php | 1 + core/l10n/th_TH.php | 1 + core/l10n/tr.php | 1 + core/l10n/ug.php | 1 + core/l10n/uk.php | 1 + core/l10n/ur_PK.php | 1 + core/l10n/vi.php | 1 + core/l10n/zh_CN.php | 1 + core/l10n/zh_HK.php | 1 + core/l10n/zh_TW.php | 1 + l10n/ar/core.po | 13 ++++++----- l10n/bg_BG/core.po | 6 ++--- l10n/bn_BD/core.po | 6 ++--- l10n/ca/core.po | 26 ++++++++++----------- l10n/ca/settings.po | 18 +++++++-------- l10n/cs_CZ/core.po | 6 ++--- l10n/cy_GB/core.po | 6 ++--- l10n/da/core.po | 6 ++--- l10n/de/core.po | 26 ++++++++++----------- l10n/de/files.po | 18 +++++++-------- l10n/de_CH/core.po | 6 ++--- l10n/de_DE/core.po | 26 ++++++++++----------- l10n/de_DE/files.po | 18 +++++++-------- l10n/el/core.po | 6 ++--- l10n/en_GB/core.po | 6 ++--- l10n/eo/core.po | 6 ++--- l10n/es/core.po | 6 ++--- l10n/es_AR/core.po | 6 ++--- l10n/et_EE/core.po | 6 ++--- l10n/eu/core.po | 6 ++--- l10n/fa/core.po | 6 ++--- l10n/fi_FI/core.po | 14 +++++------ l10n/fi_FI/files.po | 14 +++++------ l10n/fr/core.po | 6 ++--- l10n/gl/core.po | 6 ++--- l10n/he/core.po | 6 ++--- l10n/hr/core.po | 6 ++--- l10n/hu_HU/core.po | 6 ++--- l10n/ia/core.po | 6 ++--- l10n/id/core.po | 6 ++--- l10n/is/core.po | 6 ++--- l10n/it/core.po | 33 +++++++++++++------------- l10n/it/files.po | 18 +++++++-------- l10n/ja_JP/core.po | 6 ++--- l10n/ja_JP/lib.po | 14 +++++------ l10n/ka_GE/core.po | 6 ++--- l10n/ko/core.po | 6 ++--- l10n/lb/core.po | 6 ++--- l10n/lt_LT/core.po | 6 ++--- l10n/lv/core.po | 6 ++--- l10n/mk/core.po | 6 ++--- l10n/ms_MY/core.po | 6 ++--- l10n/my_MM/core.po | 6 ++--- l10n/nb_NO/core.po | 6 ++--- l10n/nl/core.po | 6 ++--- l10n/nn_NO/core.po | 6 ++--- l10n/oc/core.po | 6 ++--- l10n/pa/core.po | 6 ++--- l10n/pl/core.po | 6 ++--- l10n/pt_BR/core.po | 26 ++++++++++----------- l10n/pt_BR/files.po | 18 +++++++-------- l10n/pt_PT/core.po | 6 ++--- l10n/ro/core.po | 40 ++++++++++++++++---------------- l10n/ro/files.po | 39 ++++++++++++++++--------------- l10n/ro/files_trashbin.po | 30 ++++++++++++------------ l10n/ro/lib.po | 20 ++++++++-------- l10n/ro/settings.po | 25 ++++++++++---------- l10n/ru/core.po | 46 +++++++++++++++++++------------------ l10n/ru/files.po | 19 +++++++-------- l10n/ru/lib.po | 15 ++++++------ l10n/ru/settings.po | 13 ++++++----- l10n/ru/user_ldap.po | 21 +++++++++-------- l10n/si_LK/core.po | 6 ++--- l10n/sk_SK/core.po | 6 ++--- l10n/sl/core.po | 6 ++--- l10n/sq/core.po | 6 ++--- l10n/sr/core.po | 6 ++--- l10n/sr@latin/core.po | 6 ++--- l10n/sv/core.po | 6 ++--- l10n/ta_LK/core.po | 6 ++--- l10n/te/core.po | 6 ++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 4 ++-- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 4 ++-- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/core.po | 6 ++--- l10n/tr/core.po | 6 ++--- l10n/ug/core.po | 6 ++--- l10n/uk/core.po | 6 ++--- l10n/ur_PK/core.po | 6 ++--- l10n/vi/core.po | 6 ++--- l10n/zh_CN/core.po | 6 ++--- l10n/zh_HK/core.po | 6 ++--- l10n/zh_TW/core.po | 6 ++--- lib/l10n/ja_JP.php | 1 + lib/l10n/ro.php | 8 ++++--- lib/l10n/ru.php | 4 ++++ settings/l10n/ca.php | 6 +++++ settings/l10n/ro.php | 10 +++++++- settings/l10n/ru.php | 3 +++ 171 files changed, 674 insertions(+), 472 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 64017b7dba6..143a5efc3da 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", +"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.", +"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Not enough space available" => "Nicht genug Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", +"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "URL cannot be empty." => "Die URL darf nicht leer sein.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln.", "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.", +"Error moving file" => "Fehler beim Verschieben der Datei", "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 4f9da434455..c58cb4bbe3e 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", +"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.", +"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Not enough space available" => "Nicht genügend Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", +"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "URL cannot be empty." => "Die URL darf nicht leer sein.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.", "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.", +"Error moving file" => "Fehler beim Verschieben der Datei", "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index ab443b28649..5345bad902b 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -13,8 +13,10 @@ $TRANSLATIONS = array( "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä", "Invalid directory." => "Virheellinen kansio.", "Files" => "Tiedostot", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Not enough space available" => "Tilaa ei ole riittävästi", "Upload cancelled." => "Lähetys peruttu.", +"Could not get result from server." => "Tuloksien saaminen palvelimelta ei onnistunut.", "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "URL cannot be empty." => "Verkko-osoite ei voi olla tyhjä", "Error" => "Virhe", @@ -37,6 +39,7 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!", "Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.", +"Error moving file" => "Virhe tiedostoa siirrettäessä", "Name" => "Nimi", "Size" => "Koko", "Modified" => "Muokattu", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 6eef9c4f69c..c24d30ae368 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manca una cartella temporanea", "Failed to write to disk" => "Scrittura su disco non riuscita", "Not enough storage available" => "Spazio di archiviazione insufficiente", +"Upload failed. Could not get file info." => "Upload fallito. Impossibile ottenere informazioni sul file", +"Upload failed. Could not find uploaded file" => "Upload fallit. Impossibile trovare file caricato", "Invalid directory." => "Cartella non valida.", "Files" => "File", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte", "Not enough space available" => "Spazio disponibile insufficiente", "Upload cancelled." => "Invio annullato", +"Could not get result from server." => "Impossibile ottenere il risultato dal server.", "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "URL cannot be empty." => "L'URL non può essere vuoto.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.", "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.", +"Error moving file" => "Errore durante lo spostamento del file", "Name" => "Nome", "Size" => "Dimensione", "Modified" => "Modificato", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index e7370491b58..cd960208565 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Pasta temporária não encontrada", "Failed to write to disk" => "Falha ao escrever no disco", "Not enough storage available" => "Espaço de armazenamento insuficiente", +"Upload failed. Could not get file info." => "Falha no envio. Não foi possível obter informações do arquivo.", +"Upload failed. Could not find uploaded file" => "Falha no envio. Não foi possível encontrar o arquivo enviado", "Invalid directory." => "Diretório inválido.", "Files" => "Arquivos", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Not enough space available" => "Espaço de armazenamento insuficiente", "Upload cancelled." => "Envio cancelado.", +"Could not get result from server." => "Não foi possível obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.", "URL cannot be empty." => "URL não pode ficar em branco", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.", "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.", +"Error moving file" => "Erro movendo o arquivo", "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 481e070eacc..b1b9af45d38 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Lipsește un dosar temporar", "Failed to write to disk" => "Eroare la scrierea discului", "Not enough storage available" => "Nu este suficient spațiu disponibil", +"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.", +"Upload failed. Could not find uploaded file" => "Încărcare eșuată. Nu se poate găsi fișierul încărcat", "Invalid directory." => "registru invalid.", "Files" => "Fișiere", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți", "Not enough space available" => "Nu este suficient spațiu disponibil", "Upload cancelled." => "Încărcare anulată.", +"Could not get result from server." => "Nu se poate obține rezultatul de la server.", "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.", "URL cannot be empty." => "Adresa URL nu poate fi golita", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud", @@ -31,9 +35,10 @@ $TRANSLATIONS = array( "cancel" => "anulare", "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}", "undo" => "Anulează ultima acțiune", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), -"_Uploading %n file_::_Uploading %n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("%n director","%n directoare","%n directoare"), +"_%n file_::_%n files_" => array("%n fișier","%n fișiere","%n fișiere"), +"{dirs} and {files}" => "{dirs} și {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."), "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", @@ -41,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin {spatiu folosit}%", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele", "Your download is being prepared. This might take some time if the files are big." => "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.", +"Error moving file" => "Eroare la mutarea fișierului", "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 083df116f66..143a3379ad4 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Отсутствует временная папка", "Failed to write to disk" => "Ошибка записи на диск", "Not enough storage available" => "Недостаточно доступного места в хранилище", +"Upload failed. Could not get file info." => "Загрузка не удалась. Невозможно получить информацию о файле", +"Upload failed. Could not find uploaded file" => "Загрузка не удалась. Невозможно найти загруженный файл", "Invalid directory." => "Неправильный каталог.", "Files" => "Файлы", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Невозможно загрузить файл {filename} так как он является директорией либо имеет размер 0 байт", "Not enough space available" => "Недостаточно свободного места", "Upload cancelled." => "Загрузка отменена.", +"Could not get result from server." => "Не получен ответ от сервера", "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.", "URL cannot be empty." => "Ссылка не может быть пустой.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы.", "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.", +"Error moving file" => "Ошибка при перемещении файла", "Name" => "Имя", "Size" => "Размер", "Modified" => "Изменён", diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php index 0b1d2cd9e17..12377bb0652 100644 --- a/apps/files_trashbin/l10n/ro.php +++ b/apps/files_trashbin/l10n/ro.php @@ -3,8 +3,8 @@ $TRANSLATIONS = array( "Error" => "Eroare", "Delete permanently" => "Stergere permanenta", "Name" => "Nume", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("","","%n directoare"), +"_%n file_::_%n files_" => array("","","%n fișiere"), "Delete" => "Șterge" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index 40cab1c5418..f1cf51dc51b 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Пароль", "For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте DN и пароль пустыми.", "User Login Filter" => "Фильтр входа пользователей", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"", "User List Filter" => "Фильтр списка пользователей", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Определяет фильтр, использующийся при получении пользователей (без подмены переменных). Например: \"objectClass=person\"", "Group Filter" => "Фильтр группы", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Определяет фильтр, использующийся при получении групп (без подмены переменных). Например: \"objectClass=posixGroup\"", "Connection Settings" => "Настройки подключения", "Configuration Active" => "Конфигурация активна", "When unchecked, this configuration will be skipped." => "Когда галочка снята, эта конфигурация будет пропущена.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает.", "Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)", "Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер сертификат SSL сервера LDAP.", "Cache Time-To-Live" => "Кэш времени жизни", "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.", "Directory Settings" => "Настройки каталога", @@ -68,10 +72,13 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Правило именования Домашней Папки Пользователя", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.", "Internal Username" => "Внутреннее имя пользователя", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.", "Internal Username Attribute:" => "Аттрибут для внутреннего имени:", "Override UUID detection" => "Переопределить нахождение UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.", "UUID Attribute:" => "Аттрибут для UUID:", "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется доменное имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP подключения! Ни в коем случае не рекомендуется сбрасывать привязки если система уже находится в эксплуатации, только на этапе тестирования.", "Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP", "Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP", "Test Configuration" => "Тестовая конфигурация", diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 62a9580b12c..f61014e19e1 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "لا", "Ok" => "موافق", "_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""), +"Cancel" => "الغاء", "The object type is not specified." => "نوع العنصر غير محدد.", "Error" => "خطأ", "The app name is not specified." => "اسم التطبيق غير محدد.", @@ -83,6 +84,8 @@ $TRANSLATIONS = array( "The update was unsuccessful. Please report this issue to the ownCloud community." => "حصل خطأ في عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى ownCloud community.", "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", +"The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "وصلة تحديث كلمة المرور بعثت الى بريدك الالكتروني.
      اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك.", +"Request failed!
      Did you make sure your email/username was right?" => "الطلب رفض!
      هل انت متأكد أن الاسم/العنوان البريدي صحيح؟", "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.", "Username" => "إسم المستخدم", "Request reset" => "طلب تعديل", diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index a4f1585420a..4f5ae5993f4 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "No" => "Не", "Ok" => "Добре", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Отказ", "Error" => "Грешка", "Share" => "Споделяне", "Share with" => "Споделено с", diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index aaf982b9e52..3b4b990ac28 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "No" => "না", "Ok" => "তথাস্তু", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "বাতির", "The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।", "Error" => "সমস্যা", "The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 448fbae0ad8..938d668b362 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -58,7 +58,15 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "D'acord", "Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"), +"One file conflict" => "Un fitxer en conflicte", +"Which files do you want to keep?" => "Quin fitxer voleu conservar?", +"If you select both versions, the copied file will have a number added to its name." => "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.", +"Cancel" => "Cancel·la", +"Continue" => "Continua", +"(all selected)" => "(selecciona-ho tot)", +"({count} selected)" => "({count} seleccionats)", +"Error loading file exists template" => "Error en carregar la plantilla de fitxer existent", "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ó.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 9ee5dd471f1..449a49f5686 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Zrušit", "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index a8b1e894e70..78eb6ba9698 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "Na", "Ok" => "Iawn", "_{count} file conflict_::_{count} file conflicts_" => array("","","",""), +"Cancel" => "Diddymu", "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.", "Error" => "Gwall", "The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 0f7f8cfc63b..e2399fdc5cc 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Nej", "Ok" => "OK", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Annuller", "The object type is not specified." => "Objekttypen er ikke angivet.", "Error" => "Fejl", "The app name is not specified." => "Den app navn er ikke angivet.", diff --git a/core/l10n/de.php b/core/l10n/de.php index 302ebe2f2f9..b5ff8826ad8 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -58,7 +58,15 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"), +"One file conflict" => "Ein Dateikonflikt", +"Which files do you want to keep?" => "Welche Dateien möchtest du behalten?", +"If you select both versions, the copied file will have a number added to its name." => "Wenn du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.", +"Cancel" => "Abbrechen", +"Continue" => "Fortsetzen", +"(all selected)" => "(Alle ausgewählt)", +"({count} selected)" => "({count} ausgewählt)", +"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage", "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 7e2d4d9f152..1fc6f6b7e1e 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Abbrechen", "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 30825d5b4bb..5b9b199f416 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -58,7 +58,15 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"), +"One file conflict" => "Ein Dateikonflikt", +"Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?", +"If you select both versions, the copied file will have a number added to its name." => "Wenn Siebeide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.", +"Cancel" => "Abbrechen", +"Continue" => "Fortsetzen", +"(all selected)" => "(Alle ausgewählt)", +"({count} selected)" => "({count} ausgewählt)", +"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage", "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/el.php b/core/l10n/el.php index 929caad1dc7..7fc58ca3527 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Όχι", "Ok" => "Οκ", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Άκυρο", "The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.", "Error" => "Σφάλμα", "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index 05d945be6db..feeacd481a8 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancel", "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index d86c2bfacda..712f97538f3 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Akcepti", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Nuligi", "The object type is not specified." => "Ne indikiĝis tipo de la objekto.", "Error" => "Eraro", "The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.", diff --git a/core/l10n/es.php b/core/l10n/es.php index b94e6b561da..3aa0c3f732c 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "Aceptar", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancelar", "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index e079d5bcff1..6dce47f760d 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "Aceptar", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancelar", "The object type is not specified." => "El tipo de objeto no está especificado. ", "Error" => "Error", "The app name is not specified." => "El nombre de la App no está especificado.", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 233756a8358..17ce89543a6 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Loobu", "The object type is not specified." => "Objekti tüüp pole määratletud.", "Error" => "Viga", "The app name is not specified." => "Rakenduse nimi ole määratletud.", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 77a1c18167b..1e6594adf6f 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Ez", "Ok" => "Ados", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Ezeztatu", "The object type is not specified." => "Objetu mota ez dago zehaztuta.", "Error" => "Errorea", "The app name is not specified." => "App izena ez dago zehaztuta.", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index ab5d3628a07..930a5b0dcbc 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "نه", "Ok" => "قبول", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "منصرف شدن", "The object type is not specified." => "نوع شی تعیین نشده است.", "Error" => "خطا", "The app name is not specified." => "نام برنامه تعیین نشده است.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index d4a922924dc..cf215159c39 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -53,6 +53,10 @@ $TRANSLATIONS = array( "No" => "Ei", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Peru", +"Continue" => "Jatka", +"(all selected)" => "(kaikki valittu)", +"({count} selected)" => "({count} valittu)", "Error" => "Virhe", "The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.", "The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index aac4ef99e5d..d3229ddf994 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -57,6 +57,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Annuler", "The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", "The app name is not specified." => "Le nom de l'application n'est pas spécifié.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 5212348872e..9ba5ab645aa 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Aceptar", "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancelar", "The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", diff --git a/core/l10n/he.php b/core/l10n/he.php index 32dcde40a95..704755da07f 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "לא", "Ok" => "בסדר", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "ביטול", "The object type is not specified." => "סוג הפריט לא צוין.", "Error" => "שגיאה", "The app name is not specified." => "שם היישום לא צוין.", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index b53301583d1..7fa81db8a21 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -38,6 +38,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "U redu", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Odustani", "Error" => "Greška", "Share" => "Podijeli", "Error while sharing" => "Greška prilikom djeljenja", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 2c30fe68b7e..d893269ee81 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Nem", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Mégsem", "The object type is not specified." => "Az objektum típusa nincs megadva.", "Error" => "Hiba", "The app name is not specified." => "Az alkalmazás neve nincs megadva.", diff --git a/core/l10n/ia.php b/core/l10n/ia.php index 9f530d47309..48d2588c002 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -25,6 +25,7 @@ $TRANSLATIONS = array( "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancellar", "Error" => "Error", "Share" => "Compartir", "Password" => "Contrasigno", diff --git a/core/l10n/id.php b/core/l10n/id.php index d8006280918..69993d44055 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "Tidak", "Ok" => "Oke", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "Batal", "The object type is not specified." => "Tipe objek tidak ditentukan.", "Error" => "Galat", "The app name is not specified." => "Nama aplikasi tidak ditentukan.", diff --git a/core/l10n/is.php b/core/l10n/is.php index 7aad8ea43ee..729aaa4c9e6 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "No" => "Nei", "Ok" => "Í lagi", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Hætta við", "The object type is not specified." => "Tegund ekki tilgreind", "Error" => "Villa", "The app name is not specified." => "Nafn forrits ekki tilgreint", diff --git a/core/l10n/it.php b/core/l10n/it.php index fa85f0ae94b..94395b02261 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -19,7 +19,7 @@ $TRANSLATIONS = array( "No image or file provided" => "Non è stata fornita alcun immagine o file", "Unknown filetype" => "Tipo di file sconosciuto", "Invalid image" => "Immagine non valida", -"No temporary profile picture available, try again" => "Nessuna foto di profilo temporanea disponibile, riprova", +"No temporary profile picture available, try again" => "Nessuna immagine di profilo provvisoria disponibile, riprova", "No crop data provided" => "Dati di ritaglio non forniti", "Sunday" => "Domenica", "Monday" => "Lunedì", @@ -53,12 +53,20 @@ $TRANSLATIONS = array( "last year" => "anno scorso", "years ago" => "anni fa", "Choose" => "Scegli", -"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}", +"Error loading file picker template: {error}" => "Errore nel caricamento del modello del selettore file: {error}", "Yes" => "Sì", "No" => "No", "Ok" => "Ok", -"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Error loading message template: {error}" => "Errore nel caricamento del modello di messaggio: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"), +"One file conflict" => "Un conflitto tra file", +"Which files do you want to keep?" => "Quali file vuoi mantenere?", +"If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, verrà aggiunto un numero al nome del file copiato.", +"Cancel" => "Annulla", +"Continue" => "Continua", +"(all selected)" => "(tutti selezionati)", +"({count} selected)" => "({count} selezionati)", +"Error loading file exists template" => "Errore durante il caricamento del modello del file esistente", "The object type is not specified." => "Il tipo di oggetto non è specificato.", "Error" => "Errore", "The app name is not specified." => "Il nome dell'applicazione non è specificato.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 8c36f965599..0baab441f95 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "Ok" => "OK", "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "キャンセル", "The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", "The app name is not specified." => "アプリ名がしていされていません。", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 42af86b2327..e051f9ce1d2 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "არა", "Ok" => "დიახ", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "უარყოფა", "The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.", "Error" => "შეცდომა", "The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 3c0ca5f4ff5..947f5e9ee26 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "아니요", "Ok" => "승락", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "취소", "The object type is not specified." => "객체 유형이 지정되지 않았습니다.", "Error" => "오류", "The app name is not specified." => "앱 이름이 지정되지 않았습니다.", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index c82f88d66de..9e127d867c6 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Nee", "Ok" => "OK", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Ofbriechen", "The object type is not specified." => "Den Typ vum Object ass net uginn.", "Error" => "Feeler", "The app name is not specified." => "Den Numm vun der App ass net uginn.", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 630d66ce679..492aee12c1d 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Gerai", "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Atšaukti", "The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", "The app name is not specified." => "Nenurodytas programos pavadinimas.", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 48bb7b5381d..6bdbeaf5e20 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Nē", "Ok" => "Labi", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Atcelt", "The object type is not specified." => "Nav norādīts objekta tips.", "Error" => "Kļūda", "The app name is not specified." => "Nav norādīts lietotnes nosaukums.", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 4caabfa7efd..1c998bb636a 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "No" => "Не", "Ok" => "Во ред", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Откажи", "The object type is not specified." => "Не е специфициран типот на објект.", "Error" => "Грешка", "The app name is not specified." => "Името на апликацијата не е специфицирано.", diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index f6517f9e513..5aea25a3fd4 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "No" => "Tidak", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "Batal", "Error" => "Ralat", "Share" => "Kongsi", "Password" => "Kata laluan", diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php index 672067508fd..0a07d151185 100644 --- a/core/l10n/my_MM.php +++ b/core/l10n/my_MM.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "No" => "မဟုတ်ဘူး", "Ok" => "အိုကေ", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "ပယ်ဖျက်မည်", "Password" => "စကားဝှက်", "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်", "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 5e08668feb4..01dec885574 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "No" => "Nei", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Avbryt", "Error" => "Feil", "Shared" => "Delt", "Share" => "Del", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index a7e9cc53012..3dcdeaedec2 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Annuleer", "The object type is not specified." => "Het object type is niet gespecificeerd.", "Error" => "Fout", "The app name is not specified." => "De app naam is niet gespecificeerd.", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 3b6566f40af..8ec3892a8ac 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Nei", "Ok" => "Greitt", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Avbryt", "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Error" => "Feil", "The app name is not specified." => "Programnamnet er ikkje spesifisert.", diff --git a/core/l10n/oc.php b/core/l10n/oc.php index 2de644e00ae..fd84d0b2e30 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -39,6 +39,7 @@ $TRANSLATIONS = array( "No" => "Non", "Ok" => "D'accòrdi", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Annula", "Error" => "Error", "Share" => "Parteja", "Error while sharing" => "Error al partejar", diff --git a/core/l10n/pa.php b/core/l10n/pa.php index 5fc13bd1f77..c8078d06c73 100644 --- a/core/l10n/pa.php +++ b/core/l10n/pa.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "No" => "ਨਹੀਂ", "Ok" => "ਠੀਕ ਹੈ", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "ਰੱਦ ਕਰੋ", "Error" => "ਗਲ", "Share" => "ਸਾਂਝਾ ਕਰੋ", "Password" => "ਪਾਸਵਰ", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index dc6e8d365b8..621038f79f7 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Nie", "Ok" => "OK", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Anuluj", "The object type is not specified." => "Nie określono typu obiektu.", "Error" => "Błąd", "The app name is not specified." => "Nie określono nazwy aplikacji.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 5f22193d0d5..5f8903a8ff5 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -58,7 +58,15 @@ $TRANSLATIONS = array( "No" => "Não", "Ok" => "Ok", "Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"), +"One file conflict" => "Conflito em um arquivo", +"Which files do you want to keep?" => "Qual arquivo você quer manter?", +"If you select both versions, the copied file will have a number added to its name." => "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.", +"Cancel" => "Cancelar", +"Continue" => "Continuar", +"(all selected)" => "(todos os selecionados)", +"({count} selected)" => "({count} selecionados)", +"Error loading file exists template" => "Erro ao carregar arquivo existe modelo", "The object type is not specified." => "O tipo de objeto não foi especificado.", "Error" => "Erro", "The app name is not specified." => "O nome do app não foi especificado.", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index f2dcf4ffd38..977d8e38cb2 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -57,6 +57,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Erro ao carregar o template: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancelar", "The object type is not specified." => "O tipo de objecto não foi especificado", "Error" => "Erro", "The app name is not specified." => "O nome da aplicação não foi especificado", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 5b0f5e6538d..12fbfa5f0ca 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s Partajat »%s« cu tine de", "group" => "grup", +"Updated database" => "Bază de date actualizată", "Category type not provided." => "Tipul de categorie nu a fost specificat.", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: %s" => "Această categorie deja există: %s", @@ -10,6 +11,8 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Eroare la adăugarea %s la favorite.", "No categories selected for deletion." => "Nicio categorie selectată pentru ștergere.", "Error removing %s from favorites." => "Eroare la ștergerea %s din favorite.", +"Unknown filetype" => "Tip fișier necunoscut", +"Invalid image" => "Imagine invalidă", "Sunday" => "Duminică", "Monday" => "Luni", "Tuesday" => "Marți", @@ -31,11 +34,11 @@ $TRANSLATIONS = array( "December" => "Decembrie", "Settings" => "Setări", "seconds ago" => "secunde în urmă", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("acum %n minut","acum %n minute","acum %n minute"), +"_%n hour ago_::_%n hours ago_" => array("acum %n oră","acum %n ore","acum %n ore"), "today" => "astăzi", "yesterday" => "ieri", -"_%n day ago_::_%n days ago_" => array("","",""), +"_%n day ago_::_%n days ago_" => array("acum %n zi","acum %n zile","acum %n zile"), "last month" => "ultima lună", "_%n month ago_::_%n months ago_" => array("","",""), "months ago" => "luni în urmă", @@ -46,6 +49,11 @@ $TRANSLATIONS = array( "No" => "Nu", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"One file conflict" => "Un conflict de fișier", +"Which files do you want to keep?" => "Ce fișiere vrei să păstrezi?", +"If you select both versions, the copied file will have a number added to its name." => "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.", +"Cancel" => "Anulare", +"Continue" => "Continuă", "The object type is not specified." => "Tipul obiectului nu este specificat.", "Error" => "Eroare", "The app name is not specified." => "Numele aplicației nu este specificat.", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 973f5f38bb7..1b3133a1a6f 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -2,9 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s поделился »%s« с вами", "group" => "группа", +"Turned on maintenance mode" => "Режим отладки включён", +"Turned off maintenance mode" => "Режим отладки отключён", "Updated database" => "База данных обновлена", "Updating filecache, this may take really long..." => "Обновление файлового кэша, это может занять некоторое время...", "Updated filecache" => "Обновлен файловый кэш", +"... %d%% done ..." => "... %d%% завершено ...", "Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: %s" => "Эта категория уже существует: %s", @@ -13,8 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Ошибка добавления %s в избранное", "No categories selected for deletion." => "Нет категорий для удаления.", "Error removing %s from favorites." => "Ошибка удаления %s из избранного", +"No image or file provided" => "Не указано изображение или файл", "Unknown filetype" => "Неизвестный тип файла", "Invalid image" => "Изображение повреждено", +"No temporary profile picture available, try again" => "Временная картинка профиля недоступна, повторите попытку", +"No crop data provided" => "Не указана информация о кадрировании", "Sunday" => "Воскресенье", "Monday" => "Понедельник", "Tuesday" => "Вторник", @@ -47,10 +53,20 @@ $TRANSLATIONS = array( "last year" => "в прошлом году", "years ago" => "несколько лет назад", "Choose" => "Выбрать", +"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}", "Yes" => "Да", "No" => "Нет", "Ok" => "Ок", -"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"), +"One file conflict" => "Один конфликт в файлах", +"Which files do you want to keep?" => "Какие файлы вы хотите сохранить?", +"If you select both versions, the copied file will have a number added to its name." => "При выборе обоих версий, к названию копируемого файла будет добавлена цифра", +"Cancel" => "Отменить", +"Continue" => "Продолжить", +"(all selected)" => "(выбраны все)", +"({count} selected)" => "({count} выбрано)", +"Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла", "The object type is not specified." => "Тип объекта не указан", "Error" => "Ошибка", "The app name is not specified." => "Имя приложения не указано", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 6752352e344..2d922657ea0 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -38,6 +38,7 @@ $TRANSLATIONS = array( "No" => "එපා", "Ok" => "හරි", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "එපා", "Error" => "දෝෂයක්", "Share" => "බෙදා හදා ගන්න", "Share with" => "බෙදාගන්න", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 55451d45362..ac45947459b 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Nie", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Zrušiť", "The object type is not specified." => "Nešpecifikovaný typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Nešpecifikované meno aplikácie.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 71a653dc627..84cd83fa2f3 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "V redu", "_{count} file conflict_::_{count} file conflicts_" => array("","","",""), +"Cancel" => "Prekliči", "The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", "The app name is not specified." => "Ime programa ni podano.", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index a3c9e5ed6e9..e0fde3f1297 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Jo", "Ok" => "Në rregull", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Anulo", "The object type is not specified." => "Nuk është specifikuar tipi i objektit.", "Error" => "Veprim i gabuar", "The app name is not specified." => "Nuk është specifikuar emri i app-it.", diff --git a/core/l10n/sr.php b/core/l10n/sr.php index fcf01301c71..064984cca5f 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "No" => "Не", "Ok" => "У реду", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Откажи", "The object type is not specified." => "Врста објекта није подешена.", "Error" => "Грешка", "The app name is not specified." => "Име програма није унето.", diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index 756fdae939f..8c0d28ef1c0 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Otkaži", "The object type is not specified." => "Tip objekta nije zadan.", "Error" => "Greška", "The app name is not specified." => "Ime aplikacije nije precizirano.", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 6d7cfa2dfcb..660cab0a620 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Nej", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Avbryt", "The object type is not specified." => "Objekttypen är inte specificerad.", "Error" => "Fel", "The app name is not specified." => " Namnet på appen är inte specificerad.", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 4dcb6188180..43c7f451e49 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "No" => "இல்லை", "Ok" => "சரி", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "இரத்து செய்க", "The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.", "Error" => "வழு", "The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.", diff --git a/core/l10n/te.php b/core/l10n/te.php index 880c29bc2a1..d54eeabb692 100644 --- a/core/l10n/te.php +++ b/core/l10n/te.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "No" => "కాదు", "Ok" => "సరే", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "రద్దుచేయి", "Error" => "పొరపాటు", "Password" => "సంకేతపదం", "Send" => "పంపించు", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 1069ce9d8c5..8eab771822d 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "No" => "ไม่ตกลง", "Ok" => "ตกลง", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "ยกเลิก", "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Error" => "ข้อผิดพลาด", "The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index b3777e94bdc..d8d9709949c 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "Hayır", "Ok" => "Tamam", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "İptal", "The object type is not specified." => "Nesne türü belirtilmemiş.", "Error" => "Hata", "The app name is not specified." => "uygulama adı belirtilmedi.", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index 6298df31354..36023cb1653 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -31,6 +31,7 @@ $TRANSLATIONS = array( "No" => "ياق", "Ok" => "جەزملە", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "ۋاز كەچ", "Error" => "خاتالىق", "Share" => "ھەمبەھىر", "Share with" => "ھەمبەھىر", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 71b1c8ba26e..23207654731 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "Ні", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Відмінити", "The object type is not specified." => "Не визначено тип об'єкту.", "Error" => "Помилка", "The app name is not specified." => "Не визначено ім'я програми.", diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php index 5bb9255fe52..fc736779122 100644 --- a/core/l10n/ur_PK.php +++ b/core/l10n/ur_PK.php @@ -24,6 +24,7 @@ $TRANSLATIONS = array( "No" => "نہیں", "Ok" => "اوکے", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "منسوخ کریں", "Error" => "ایرر", "Error while sharing" => "شئیرنگ کے دوران ایرر", "Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 91f756e2663..1c99aad9a4d 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "No" => "Không", "Ok" => "Đồng ý", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "Hủy", "The object type is not specified." => "Loại đối tượng không được chỉ định.", "Error" => "Lỗi", "The app name is not specified." => "Tên ứng dụng không được chỉ định.", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 471aa735c48..04c4630b222 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "否", "Ok" => "好", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "取消", "The object type is not specified." => "未指定对象类型。", "Error" => "错误", "The app name is not specified." => "未指定应用名称。", diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index f8e9cc21762..f6c4003af61 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "取消", "Error" => "錯誤", "Shared" => "已分享", "Share" => "分享", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 0a9a9db7331..759a4fdc35e 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "No" => "否", "Ok" => "好", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"Cancel" => "取消", "The object type is not specified." => "未指定物件類型。", "Error" => "錯誤", "The app name is not specified." => "沒有指定 app 名稱。", diff --git a/l10n/ar/core.po b/l10n/ar/core.po index fd75a547f8b..56e2c293e47 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# blackcoder , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-22 00:50+0000\n" +"Last-Translator: blackcoder \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" @@ -308,7 +309,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "الغاء" #: js/oc-dialogs.js:386 msgid "Continue" @@ -500,11 +501,11 @@ msgid "" "The link to reset your password has been sent to your email.
      If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.
      If it is not there ask your local administrator ." -msgstr "" +msgstr "وصلة تحديث كلمة المرور بعثت الى بريدك الالكتروني.
      اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك." #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!
      Did you make sure your email/username was right?" -msgstr "" +msgstr "الطلب رفض!
      هل انت متأكد أن الاسم/العنوان البريدي صحيح؟" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 4237a779982..432e35d9270 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Отказ" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 9c545be3823..36e98dacdad 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "বাতির" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index b9bcb7573d3..aaabc519ac8 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:30+0000\n" +"Last-Translator: rogerc\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" @@ -271,42 +271,42 @@ msgstr "Error en carregar la plantilla de missatge: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} conflicte de fitxer" +msgstr[1] "{count} conflictes de fitxer" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Un fitxer en conflicte" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Quin fitxer voleu conservar?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancel·la" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continua" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(selecciona-ho tot)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} seleccionats)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Error en carregar la plantilla de fitxer existent" #: 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 diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 0aafc8549f8..1053dcb2434 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-20 15:20+0000\n" +"Last-Translator: rogerc\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" @@ -88,32 +88,32 @@ msgstr "No s'ha pogut actualitzar l'aplicació." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Contrasenya incorrecta" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "No heu proporcionat cap usuari" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "No es pot canviar la contrasenya" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 038c8c297c0..61a7e861b2a 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -298,7 +298,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Zrušit" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index 986f5a871aa..1e0692c377b 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -299,7 +299,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Diddymu" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/da/core.po b/l10n/da/core.po index e1bdb36d528..690bb46c211 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -292,7 +292,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Annuller" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/de/core.po b/l10n/de/core.po index 0f23d0cd3fb..44eb6eec040 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-21 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,42 +277,42 @@ msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} Dateikonflikt" +msgstr[1] "{count} Dateikonflikte" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Ein Dateikonflikt" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Welche Dateien möchtest du behalten?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Wenn du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Abbrechen" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Fortsetzen" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(Alle ausgewählt)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} ausgewählt)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Fehler beim Laden der vorhanden Dateivorlage" #: 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 diff --git a/l10n/de/files.po b/l10n/de/files.po index 01786015647..06bce644638 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,23 +82,23 @@ msgstr "Nicht genug Speicher vorhanden." #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Dateien" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist" #: js/file-upload.js:255 msgid "Not enough space available" @@ -110,7 +110,7 @@ msgstr "Upload abgebrochen." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Ergebnis konnte nicht vom Server abgerufen werden." #: js/file-upload.js:446 msgid "" @@ -227,7 +227,7 @@ msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas d #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Fehler beim Verschieben der Datei" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index cef773ced76..cb7631fdc2f 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -297,7 +297,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Abbrechen" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index a9bc9abea06..cfdcd679973 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-21 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,42 +277,42 @@ msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} Dateikonflikt" +msgstr[1] "{count} Dateikonflikte" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Ein Dateikonflikt" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Welche Dateien möchten Sie behalten?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Wenn Siebeide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Abbrechen" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Fortsetzen" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(Alle ausgewählt)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} ausgewählt)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Fehler beim Laden der vorhanden Dateivorlage" #: 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 diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 9e4d2a24388..ce852eb583f 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,23 +85,23 @@ msgstr "Nicht genug Speicher vorhanden." #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Dateien" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist" #: js/file-upload.js:255 msgid "Not enough space available" @@ -113,7 +113,7 @@ msgstr "Upload abgebrochen." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Ergebnis konnte nicht vom Server abgerufen werden." #: js/file-upload.js:446 msgid "" @@ -230,7 +230,7 @@ msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas da #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Fehler beim Verschieben der Datei" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/el/core.po b/l10n/el/core.po index c045d09efeb..9b88a333be1 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -295,7 +295,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Άκυρο" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index 7e5c1ed0791..5ac5d34f566 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancel" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index 8c3e0433831..1ea5a607492 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Nuligi" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/es/core.po b/l10n/es/core.po index 1e83ffd6681..5e96058e82f 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -298,7 +298,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index dd3a48b0d1e..6c72e8a9b00 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index b94690c975e..872a66ae6aa 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Loobu" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index ccac1c7de4a..456f415e684 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Ezeztatu" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index a4e9885b054..971a51aa87d 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -284,7 +284,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "منصرف شدن" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 6eecad24ce9..2a2872e2550 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-21 10:30+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -290,19 +290,19 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Peru" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Jatka" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(kaikki valittu)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} valittu)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index cc0dfaf5c1f..3e4e67e31d9 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 10:30+0000\n" +"Last-Translator: Jiri Grönroos \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" @@ -87,13 +87,13 @@ msgstr "" msgid "Invalid directory." msgstr "Virheellinen kansio." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Tiedostot" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua" #: js/file-upload.js:255 msgid "Not enough space available" @@ -105,7 +105,7 @@ msgstr "Lähetys peruttu." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Tuloksien saaminen palvelimelta ei onnistunut." #: js/file-upload.js:446 msgid "" @@ -222,7 +222,7 @@ msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Virhe tiedostoa siirrettäessä" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 011e6dbd15a..76dc658c71d 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -294,7 +294,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Annuler" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 25a8ee333ff..72986b81c8a 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/he/core.po b/l10n/he/core.po index 1f7da9c0253..c8ae1beb1e5 100644 --- a/l10n/he/core.po +++ b/l10n/he/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "ביטול" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index 583405240bb..59f10907b07 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -293,7 +293,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Odustani" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 9a7ab1014f3..7b484995d4b 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Mégsem" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 5a048cfc144..194b8863fff 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/id/core.po b/l10n/id/core.po index 355807ff032..2a8ac8b61c4 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Batal" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/is/core.po b/l10n/is/core.po index e4e28667bae..f2fe78f0c1c 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Hætta við" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/it/core.po b/l10n/it/core.po index 4189836997f..d587e959539 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# nappo , 2013 # idetao , 2013 # polxmod , 2013 # Vincenzo Reale , 2013 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-22 13:40+0000\n" +"Last-Translator: nappo \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" @@ -107,7 +108,7 @@ msgstr "Immagine non valida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "Nessuna foto di profilo temporanea disponibile, riprova" +msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova" #: avatar/controller.php:135 msgid "No crop data provided" @@ -251,7 +252,7 @@ msgstr "Scegli" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "Errore durante il caricamento del modello del selettore file: {error}" +msgstr "Errore nel caricamento del modello del selettore file: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -267,47 +268,47 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "Errore durante il caricamento del modello di messaggio: {error}" +msgstr "Errore nel caricamento del modello di messaggio: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} file in conflitto" +msgstr[1] "{count} file in conflitto" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Un conflitto tra file" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Quali file vuoi mantenere?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Se selezioni entrambe le versioni, verrà aggiunto un numero al nome del file copiato." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Annulla" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continua" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(tutti selezionati)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} selezionati)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Errore durante il caricamento del modello del file esistente" #: 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 diff --git a/l10n/it/files.po b/l10n/it/files.po index cde611190ef..4711aa723a8 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 17:50+0000\n" +"Last-Translator: polxmod \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" @@ -78,23 +78,23 @@ msgstr "Spazio di archiviazione insufficiente" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Upload fallito. Impossibile ottenere informazioni sul file" #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Upload fallit. Impossibile trovare file caricato" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Cartella non valida." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "File" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte" #: js/file-upload.js:255 msgid "Not enough space available" @@ -106,7 +106,7 @@ msgstr "Invio annullato" #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Impossibile ottenere il risultato dal server." #: js/file-upload.js:446 msgid "" @@ -223,7 +223,7 @@ msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Errore durante lo spostamento del file" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index f72301efcb2..0e8b19b17e3 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -287,7 +287,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "キャンセル" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index 7cae81c6ad9..6b0484f521d 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 05:50+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-21 13:50+0000\n" +"Last-Translator: tt yn \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" @@ -59,7 +59,7 @@ msgstr "\"%s\" へのアップグレードに失敗しました。" #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "暗号無しでは利用不可なカスタムプロフィール画像" #: avatar.php:64 msgid "Unknown filetype" @@ -168,15 +168,15 @@ msgstr "認証エラー" msgid "Token expired. Please reload page." msgstr "トークンが無効になりました。ページを再読込してください。" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "ファイル" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "TTY TDD" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "画像" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 247c6892b0a..5c70d01e3e1 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "უარყოფა" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index b545b194b2e..ee7f0753f7e 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -285,7 +285,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "취소" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index d0e584ef604..0ee9039e603 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Ofbriechen" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 87de0d1aaac..f340c7a46db 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -297,7 +297,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Atšaukti" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index b4f827bd08f..813a5545833 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -294,7 +294,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Atcelt" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 94b36d5a9c5..c1f6fdbed94 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Откажи" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 38457ad1118..3809aef14ed 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Batal" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index d66c528d963..f2f4b06658f 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "ပယ်ဖျက်မည်" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 7d6a9bedeb1..b9a4a85d03b 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 9b6abbaf29c..1c2702b714d 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -291,7 +291,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Annuleer" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 42a5e395e01..40a6de51ba5 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -291,7 +291,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 91003bba794..10cb2464313 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Annula" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/pa/core.po b/l10n/pa/core.po index a7fc0e1e131..184ac05da01 100644 --- a/l10n/pa/core.po +++ b/l10n/pa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "ਰੱਦ ਕਰੋ" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 1e9839e6f69..3d7aae83bae 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -295,7 +295,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 06857800f33..281471b1b94 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 16:40+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -271,42 +271,42 @@ msgstr "Erro no carregamento de modelo de mensagem: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} conflito de arquivo" +msgstr[1] "{count} conflitos de arquivos" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Conflito em um arquivo" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Qual arquivo você quer manter?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continuar" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(todos os selecionados)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} selecionados)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Erro ao carregar arquivo existe modelo" #: 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 diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index d9d4aaf18f5..1b491703bdd 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-20 16:40+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,23 +79,23 @@ msgstr "Espaço de armazenamento insuficiente" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Falha no envio. Não foi possível obter informações do arquivo." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Diretório inválido." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Arquivos" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes" #: js/file-upload.js:255 msgid "Not enough space available" @@ -107,7 +107,7 @@ msgstr "Envio cancelado." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Não foi possível obter o resultado do servidor." #: js/file-upload.js:446 msgid "" @@ -224,7 +224,7 @@ msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os ar #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Erro movendo o arquivo" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index d0a28fbf406..974950a164f 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -293,7 +293,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index db5393d90c5..5e6a50773fd 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-21 20:00+0000\n" +"Last-Translator: corneliu.e \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" @@ -40,7 +40,7 @@ msgstr "" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Bază de date actualizată" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." @@ -100,11 +100,11 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Tip fișier necunoscut" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imagine invalidă" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -201,16 +201,16 @@ msgstr "secunde în urmă" #: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "acum %n minut" +msgstr[1] "acum %n minute" +msgstr[2] "acum %n minute" #: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "acum %n oră" +msgstr[1] "acum %n ore" +msgstr[2] "acum %n ore" #: js/js.js:869 msgid "today" @@ -223,9 +223,9 @@ msgstr "ieri" #: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "acum %n zi" +msgstr[1] "acum %n zile" +msgstr[2] "acum %n zile" #: js/js.js:872 msgid "last month" @@ -283,25 +283,25 @@ msgstr[2] "" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Un conflict de fișier" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Ce fișiere vrei să păstrezi?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa." #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Anulare" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continuă" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index e40c8605cfc..85ce986ea03 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# corneliu.e , 2013 # dimaursu16 , 2013 # inaina , 2013 # ripkid666 , 2013 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 16:50+0000\n" +"Last-Translator: corneliu.e \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" @@ -80,23 +81,23 @@ msgstr "Nu este suficient spațiu disponibil" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "registru invalid." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Fișiere" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți" #: js/file-upload.js:255 msgid "Not enough space available" @@ -108,7 +109,7 @@ msgstr "Încărcare anulată." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Nu se poate obține rezultatul de la server." #: js/file-upload.js:446 msgid "" @@ -170,27 +171,27 @@ msgstr "Anulează ultima acțiune" #: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n director" +msgstr[1] "%n directoare" +msgstr[2] "%n directoare" #: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n fișier" +msgstr[1] "%n fișiere" +msgstr[2] "%n fișiere" #: js/filelist.js:541 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} și {files}" #: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Se încarcă %n fișier." +msgstr[1] "Se încarcă %n fișiere." +msgstr[2] "Se încarcă %n fișiere." #: js/files.js:25 msgid "'.' is an invalid file name." @@ -228,7 +229,7 @@ msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișiere #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Eroare la mutarea fișierului" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po index 59197c9f4fd..916fba8a41d 100644 --- a/l10n/ro/files_trashbin.po +++ b/l10n/ro/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"PO-Revision-Date: 2013-09-21 16:50+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" @@ -27,45 +27,45 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Eroare" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Stergere permanenta" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Nume" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "" -#: js/trash.js:191 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n directoare" -#: js/trash.js:197 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n fișiere" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trashbin.php:814 lib/trashbin.php:816 msgid "restored" msgstr "" @@ -73,11 +73,11 @@ msgstr "" msgid "Nothing in here. Your trash bin is empty!" msgstr "" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Șterge" diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po index eae9302c753..8f288b515ed 100644 --- a/l10n/ro/lib.po +++ b/l10n/ro/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-21 20:00+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" @@ -60,11 +60,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Tip fișier necunoscut" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imagine invalidă" #: defaults.php:35 msgid "web services under your control" @@ -165,15 +165,15 @@ msgstr "Eroare la autentificare" msgid "Token expired. Please reload page." msgstr "Token expirat. Te rugăm să reîncarci pagina." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fișiere" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Text" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Imagini" @@ -286,14 +286,14 @@ msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "acum %n minute" #: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "acum %n ore" #: template/functions.php:99 msgid "today" @@ -308,7 +308,7 @@ msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "acum %n zile" #: template/functions.php:102 msgid "last month" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 858e3cb2a17..6f79f4b1e05 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# corneliu.e , 2013 # sergiu_sechel , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-21 20:00+0000\n" +"Last-Translator: corneliu.e \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" @@ -49,7 +50,7 @@ msgstr "E-mail salvat" #: ajax/lostpassword.php:14 msgid "Invalid email" -msgstr "E-mail nevalid" +msgstr "E-mail invalid" #: ajax/removegroup.php:13 msgid "Unable to delete group" @@ -87,7 +88,7 @@ msgstr "Aplicaţia nu s-a putut actualiza." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Parolă greșită" #: changepassword/controller.php:42 msgid "No user supplied" @@ -112,7 +113,7 @@ msgstr "" #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Imposibil de schimbat parola" #: js/apps.js:43 msgid "Update to {appversion}" @@ -318,7 +319,7 @@ msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legăt #: templates/admin.php:143 msgid "Allow public uploads" -msgstr "" +msgstr "Permite încărcări publice" #: templates/admin.php:144 msgid "" @@ -490,7 +491,7 @@ msgstr "Completează o adresă de mail pentru a-ți putea recupera parola" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Imagine de profil" #: templates/personal.php:90 msgid "Upload new" @@ -502,7 +503,7 @@ msgstr "" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Înlătură imagine" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -514,7 +515,7 @@ msgstr "" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Alege drept imagine de profil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" @@ -591,11 +592,11 @@ msgstr "Stocare" #: templates/users.php:108 msgid "change display name" -msgstr "" +msgstr "schimbă numele afișat" #: templates/users.php:112 msgid "set new password" -msgstr "" +msgstr "setează parolă nouă" #: templates/users.php:143 msgid "Default" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 6570bde0635..f5720110be1 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -3,9 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex , 2013 # alfsoft , 2013 # lord93 , 2013 # foool , 2013 +# jekader , 2013 # eurekafag , 2013 # sk.avenger , 2013 # Victor Bravo <>, 2013 @@ -16,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-22 12:00+0000\n" +"Last-Translator: jekader \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" @@ -37,11 +39,11 @@ msgstr "группа" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Режим отладки включён" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Режим отладки отключён" #: ajax/update.php:17 msgid "Updated database" @@ -58,7 +60,7 @@ msgstr "Обновлен файловый кэш" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% завершено ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -101,7 +103,7 @@ msgstr "Ошибка удаления %s из избранного" #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Не указано изображение или файл" #: avatar/controller.php:81 msgid "Unknown filetype" @@ -113,11 +115,11 @@ msgstr "Изображение повреждено" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Временная картинка профиля недоступна, повторите попытку" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Не указана информация о кадрировании" #: js/config.php:32 msgid "Sunday" @@ -261,7 +263,7 @@ msgstr "Выбрать" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Ошибка при загрузке шаблона выбора файлов: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -277,48 +279,48 @@ msgstr "Ок" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Ошибка загрузки шаблона сообщений: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{count} конфликт в файлах" +msgstr[1] "{count} конфликта в файлах" +msgstr[2] "{count} конфликтов в файлах" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Один конфликт в файлах" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Какие файлы вы хотите сохранить?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "При выборе обоих версий, к названию копируемого файла будет добавлена цифра" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Отменить" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Продолжить" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(выбраны все)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} выбрано)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -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 diff --git a/l10n/ru/files.po b/l10n/ru/files.po index bb956fc01cd..114807f5303 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -4,6 +4,7 @@ # # Translators: # lord93 , 2013 +# jekader , 2013 # eurekafag , 2013 # Victor Bravo <>, 2013 # navigator666 , 2013 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"PO-Revision-Date: 2013-09-21 12:30+0000\n" +"Last-Translator: jekader \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,23 +83,23 @@ msgstr "Недостаточно доступного места в хранил #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Загрузка не удалась. Невозможно получить информацию о файле" #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Загрузка не удалась. Невозможно найти загруженный файл" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Неправильный каталог." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Файлы" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Невозможно загрузить файл {filename} так как он является директорией либо имеет размер 0 байт" #: js/file-upload.js:255 msgid "Not enough space available" @@ -110,7 +111,7 @@ msgstr "Загрузка отменена." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Не получен ответ от сервера" #: js/file-upload.js:446 msgid "" @@ -230,7 +231,7 @@ msgstr "Загрузка началась. Это может потребова #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Ошибка при перемещении файла" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 03120345444..35f30708405 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -4,6 +4,7 @@ # # Translators: # Alexander Shashkevych , 2013 +# jekader , 2013 # eurekafag , 2013 # sk.avenger , 2013 # navigator666 , 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 12:50+0000\n" -"Last-Translator: sk.avenger \n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-21 11:50+0000\n" +"Last-Translator: jekader \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" @@ -60,7 +61,7 @@ msgstr "Не смог обновить \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Пользовательские картинки профиля ещё не поддерживают шифрование" #: avatar.php:64 msgid "Unknown filetype" @@ -140,13 +141,13 @@ msgstr "Приложение невозможно установить. Не с msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Приложение невозможно установить. Оно содержит параметр true который не допустим для приложений, не входящих в поставку." #: installer.php:152 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений" #: installer.php:162 msgid "App directory already exists" @@ -155,7 +156,7 @@ msgstr "Папка приложения уже существует" #: installer.php:175 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Не удалось создать директорию. Исправьте права доступа. %s" #: json.php:28 msgid "Application is not enabled" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index e70eab1bd49..94e073154df 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -7,6 +7,7 @@ # Alexander Shashkevych , 2013 # alfsoft , 2013 # lord93 , 2013 +# jekader , 2013 # eurekafag , 2013 # navigator666 , 2013 # hackproof , 2013 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"PO-Revision-Date: 2013-09-21 11:20+0000\n" +"Last-Translator: jekader \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" @@ -98,13 +99,13 @@ msgstr "Неправильный пароль" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Пользователь не задан" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Пожалуйста введите администраторский пароль восстановления, иначе все пользовательские данные будут утеряны" #: changepassword/controller.php:79 msgid "" @@ -115,7 +116,7 @@ msgstr "Неправильный пароль восстановления. Пр msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён" #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index a454bfc58e1..68e53bc41e1 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -6,14 +6,15 @@ # Alexander Shashkevych , 2013 # Fenuks , 2013 # alfsoft , 2013 +# jekader , 2013 # navigator666 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 08:20+0000\n" -"Last-Translator: navigator666 \n" +"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"PO-Revision-Date: 2013-09-21 11:40+0000\n" +"Last-Translator: jekader \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" @@ -159,7 +160,7 @@ msgstr "Фильтр входа пользователей" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -169,7 +170,7 @@ msgstr "Фильтр списка пользователей" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Определяет фильтр, использующийся при получении пользователей (без подмены переменных). Например: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -179,7 +180,7 @@ msgstr "Фильтр группы" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Определяет фильтр, использующийся при получении групп (без подмены переменных). Например: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -240,7 +241,7 @@ msgstr "Отключить проверку сертификата SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер сертификат SSL сервера LDAP." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -350,7 +351,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP." #: templates/settings.php:100 msgid "Internal Username Attribute:" @@ -369,7 +370,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -391,7 +392,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется доменное имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP подключения! Ни в коем случае не рекомендуется сбрасывать привязки если система уже находится в эксплуатации, только на этапе тестирования." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 0bd8e5d646b..e0d22e9b2b2 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "එපා" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index 22b868c88e6..7c9758b4cc8 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -295,7 +295,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Zrušiť" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index d67d119a51b..57c093c4eeb 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -300,7 +300,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Prekliči" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 249f4fdcadf..c2395b2d0be 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -290,7 +290,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Anulo" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 6c29c2d9def..b0063f1a942 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -293,7 +293,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Откажи" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index 6fc014eedf4..da5af6328b4 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -294,7 +294,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 84b71673c35..64959498162 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -292,7 +292,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 511b0ca1133..85ae869a752 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "இரத்து செய்க" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/te/core.po b/l10n/te/core.po index 807fd914571..fa997fc7fcc 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "రద్దుచేయి" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 33882c89991..e3ee79caef9 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\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 93b709990c0..6dd2e8281c0 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:51-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,7 +87,7 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 30de1ff6de2..17a33f87927 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:51-0400\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 b5ecc6f796e..5d1b69c53a1 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\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 7524db3041a..bc0fb489f73 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index cd6766aee43..c0b82eeb690 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: lib/trash.php:814 lib/trash.php:816 +#: lib/trashbin.php:814 lib/trashbin.php:816 msgid "restored" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 17353203915..42221b00287 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\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 2202934fcda..15b4f1c6d06 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"POT-Creation-Date: 2013-09-22 12:56-0400\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 034369deddf..4602bc52d64 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"POT-Creation-Date: 2013-09-22 12:56-0400\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 1f0ca9c4ef9..c27848c3666 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\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 9ea999ee237..e23c0a1dc54 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"POT-Creation-Date: 2013-09-22 12:54-0400\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/core.po b/l10n/th_TH/core.po index db30ee027ea..8700d149b0f 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "ยกเลิก" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 3c751e4cd35..286f827c66c 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -291,7 +291,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "İptal" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 6078bee4c5f..2550b6d4ad0 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "ۋاز كەچ" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index b30a1633773..2deda9a93d5 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -293,7 +293,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Відмінити" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 4b4391115ef..ab9aac58cff 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+0000\n" "Last-Translator: I Robot \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "منسوخ کریں" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index 6d9203adc4b..d2f455e39e9 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -284,7 +284,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "Hủy" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 50a09f4c32c..f321e4cfc4b 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -286,7 +286,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "取消" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index edcf03cc9dd..b4aef3cc566 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -283,7 +283,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "取消" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 76b1ce04f5b..4db9d316b84 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"PO-Revision-Date: 2013-09-20 15:01+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" @@ -285,7 +285,7 @@ msgstr "" #: js/oc-dialogs.js:376 msgid "Cancel" -msgstr "" +msgstr "取消" #: js/oc-dialogs.js:386 msgid "Continue" diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php index 746ef17c575..b9e6a0e6924 100644 --- a/lib/l10n/ja_JP.php +++ b/lib/l10n/ja_JP.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Users" => "ユーザ", "Admin" => "管理", "Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。", +"Custom profile pictures don't work with encryption yet" => "暗号無しでは利用不可なカスタムプロフィール画像", "Unknown filetype" => "不明なファイルタイプ", "Invalid image" => "無効な画像", "web services under your control" => "管理下のウェブサービス", diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php index b338b349239..76dafcd03e0 100644 --- a/lib/l10n/ro.php +++ b/lib/l10n/ro.php @@ -5,6 +5,8 @@ $TRANSLATIONS = array( "Settings" => "Setări", "Users" => "Utilizatori", "Admin" => "Admin", +"Unknown filetype" => "Tip fișier necunoscut", +"Invalid image" => "Imagine invalidă", "web services under your control" => "servicii web controlate de tine", "ZIP download is turned off." => "Descărcarea ZIP este dezactivată.", "Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.", @@ -19,11 +21,11 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.", "Please double check the installation guides." => "Vă rugăm să verificați ghiduri de instalare.", "seconds ago" => "secunde în urmă", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("","","acum %n minute"), +"_%n hour ago_::_%n hours ago_" => array("","","acum %n ore"), "today" => "astăzi", "yesterday" => "ieri", -"_%n day go_::_%n days ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("","","acum %n zile"), "last month" => "ultima lună", "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "ultimul an", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 0fe88efef70..501065f8b5f 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Users" => "Пользователи", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Пользовательские картинки профиля ещё не поддерживают шифрование", "Unknown filetype" => "Неизвестный тип файла", "Invalid image" => "Изображение повреждено", "web services under your control" => "веб-сервисы под вашим управлением", @@ -25,7 +26,10 @@ $TRANSLATIONS = array( "App does not provide an info.xml file" => "Приложение не имеет файла info.xml", "App can't be installed because of not allowed code in the App" => "Приложение невозможно установить. В нем содержится запрещенный код.", "App can't be installed because it is not compatible with this version of ownCloud" => "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Приложение невозможно установить. Оно содержит параметр true который не допустим для приложений, не входящих в поставку.", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений", "App directory already exists" => "Папка приложения уже существует", +"Can't create app folder. Please fix permissions. %s" => "Не удалось создать директорию. Исправьте права доступа. %s", "Application is not enabled" => "Приложение не разрешено", "Authentication error" => "Ошибка аутентификации", "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.", diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php index c442fb84b98..c4c61c0354a 100644 --- a/settings/l10n/ca.php +++ b/settings/l10n/ca.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s", "Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s", "Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.", +"Wrong password" => "Contrasenya incorrecta", +"No user supplied" => "No heu proporcionat cap usuari", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran", +"Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.", +"Unable to change password" => "No es pot canviar la contrasenya", "Update to {appversion}" => "Actualitza a {appversion}", "Disable" => "Desactiva", "Enable" => "Habilita", diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php index b0735af4aab..c3483f83deb 100644 --- a/settings/l10n/ro.php +++ b/settings/l10n/ro.php @@ -7,7 +7,7 @@ $TRANSLATIONS = array( "Group already exists" => "Grupul există deja", "Unable to add group" => "Nu s-a putut adăuga grupul", "Email saved" => "E-mail salvat", -"Invalid email" => "E-mail nevalid", +"Invalid email" => "E-mail invalid", "Unable to delete group" => "Nu s-a putut șterge grupul", "Unable to delete user" => "Nu s-a putut șterge utilizatorul", "Language changed" => "Limba a fost schimbată", @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s", "Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s", "Couldn't update app." => "Aplicaţia nu s-a putut actualiza.", +"Wrong password" => "Parolă greșită", +"Unable to change password" => "Imposibil de schimbat parola", "Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}", "Disable" => "Dezactivați", "Enable" => "Activare", @@ -51,6 +53,7 @@ $TRANSLATIONS = array( "Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare", "Allow links" => "Pemite legături", "Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături", +"Allow public uploads" => "Permite încărcări publice", "Allow resharing" => "Permite repartajarea", "Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei", "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine", @@ -84,6 +87,9 @@ $TRANSLATIONS = array( "Email" => "Email", "Your email address" => "Adresa ta de email", "Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola", +"Profile picture" => "Imagine de profil", +"Remove image" => "Înlătură imagine", +"Choose as profile image" => "Alege drept imagine de profil", "Language" => "Limba", "Help translate" => "Ajută la traducere", "WebDAV" => "WebDAV", @@ -94,6 +100,8 @@ $TRANSLATIONS = array( "Other" => "Altele", "Username" => "Nume utilizator", "Storage" => "Stocare", +"change display name" => "schimbă numele afișat", +"set new password" => "setează parolă nouă", "Default" => "Implicită" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 7bcceb8b905..1bce6332c76 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -17,7 +17,10 @@ $TRANSLATIONS = array( "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Couldn't update app." => "Невозможно обновить приложение", "Wrong password" => "Неправильный пароль", +"No user supplied" => "Пользователь не задан", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Пожалуйста введите администраторский пароль восстановления, иначе все пользовательские данные будут утеряны", "Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён", "Unable to change password" => "Невозможно изменить пароль", "Update to {appversion}" => "Обновить до {версия приложения}", "Disable" => "Выключить", -- cgit v1.2.3 From 0b4de847a93357160dc4acb3de651a7ee08a10df Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 13:27:43 +0200 Subject: Added more error checking in add() --- lib/tags.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 2eaa603c1a3..e2e1a83dd94 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -233,17 +233,25 @@ class Tags implements \OCP\ITags { return false; } try { - \OCP\DB::insertIfNotExist(self::TAG_TABLE, + $result = \OCP\DB::insertIfNotExist( + self::TAG_TABLE, array( 'uid' => $this->user, 'type' => $this->type, 'category' => $name, - )); - } catch(\Exception $e) { - \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - \OCP\Util::ERROR); + ) + ); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; + } elseif((int)$result === 0) { + \OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG); } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } $id = \OCP\DB::insertid(self::TAG_TABLE); \OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG); $this->tags[$id] = $name; -- cgit v1.2.3 From 93258e11701205b47b3775dbbb5f187a3a76266b Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 13:29:21 +0200 Subject: Forgot to return false if add() didn't add anything. --- lib/tags.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index e2e1a83dd94..955eb3cd363 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -246,6 +246,7 @@ class Tags implements \OCP\ITags { return false; } elseif((int)$result === 0) { \OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG); + return false; } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), -- cgit v1.2.3 From 910a0338bb296e2e51d6c9d37d0483f8d05b1c5c Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 15:52:06 +0200 Subject: Use fetchOne() instead of numRows() when doing a COUNT(*). --- lib/tags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 955eb3cd363..ff9f35ebc9e 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -119,7 +119,7 @@ class Tags implements \OCP\ITags { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } - return ((int)$result->numRows() === 0); + return ((int)$result->fetchOne() === 0); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR); -- cgit v1.2.3 From e55f25b64df09a3ba6535274eaf738e82910e1f6 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 23 Sep 2013 22:04:37 +0200 Subject: handle error situation of rename proper --- lib/connector/sabre/directory.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 3181a4b310f..9e0fe5e64e7 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -88,7 +88,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa } // rename to correct path - \OC\Files\Filesystem::rename($partpath, $newPath); + $renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath); + if (!$renameOkay) { + \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); + \OC\Files\Filesystem::unlink($partpath); + throw new Sabre_DAV_Exception(); + } // allow sync clients to send the mtime along in a header $mtime = OC_Request::hasModificationTime(); -- cgit v1.2.3 From 5ca181eb23de7d3436b22ba924788db62976a059 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 4 Sep 2013 08:16:27 +0200 Subject: More trimming --- lib/vcategories.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/vcategories.php b/lib/vcategories.php index 84036958359..a7e4c54be29 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -179,6 +179,7 @@ class OC_VCategories { if(is_numeric($category)) { $catid = $category; } elseif(is_string($category)) { + $category = trim($category); $catid = $this->array_searchi($category, $this->categories); } OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); @@ -240,6 +241,7 @@ class OC_VCategories { if(is_numeric($category)) { $catid = $category; } elseif(is_string($category)) { + $category = trim($category); $catid = $this->array_searchi($category, $this->categories); } OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); @@ -301,6 +303,7 @@ class OC_VCategories { * @returns int the id of the added category or false if it already exists. */ public function add($name) { + $name = trim($name); OCP\Util::writeLog('core', __METHOD__.', name: ' . $name, OCP\Util::DEBUG); if($this->hasCategory($name)) { OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG); @@ -331,6 +334,8 @@ class OC_VCategories { * @returns bool */ public function rename($from, $to) { + $from = trim($from); + $to = trim($to); $id = $this->array_searchi($from, $this->categories); if($id === false) { OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG); @@ -656,6 +661,7 @@ class OC_VCategories { public function addToCategory($objid, $category, $type = null) { $type = is_null($type) ? $this->type : $type; if(is_string($category) && !is_numeric($category)) { + $category = trim($category); if(!$this->hasCategory($category)) { $this->add($category, true); } @@ -688,9 +694,13 @@ class OC_VCategories { */ public function removeFromCategory($objid, $category, $type = null) { $type = is_null($type) ? $this->type : $type; - $categoryid = (is_string($category) && !is_numeric($category)) - ? $this->array_searchi($category, $this->categories) - : $category; + if(is_string($category) && !is_numeric($category)) { + $category = trim($category); + $categoryid = $this->array_searchi($category, $this->categories); + } else { + $categoryid = $category; + } + try { $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; @@ -716,6 +726,8 @@ class OC_VCategories { $names = array($names); } + $names = array_map('trim', $names); + OC_Log::write('core', __METHOD__ . ', before: ' . print_r($this->categories, true), OC_Log::DEBUG); foreach($names as $name) { -- cgit v1.2.3 From 45f73feb6967b878b2e39fc4413aca92f0dbaf9f Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 00:37:00 +0200 Subject: OC_VCategories=>OC\Tags. Public interface + getter in server container --- lib/public/iservercontainer.php | 7 + lib/public/itags.php | 173 +++++++++ lib/server.php | 16 +- lib/tags.php | 621 ++++++++++++++++++++++++++++++ lib/vcategories.php | 833 ---------------------------------------- tests/lib/tags.php | 133 +++++++ tests/lib/vcategories.php | 128 ------ 7 files changed, 948 insertions(+), 963 deletions(-) create mode 100644 lib/public/itags.php create mode 100644 lib/tags.php delete mode 100644 lib/vcategories.php create mode 100644 tests/lib/tags.php delete mode 100644 tests/lib/vcategories.php (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 4478a4e8a6c..0df746a28ed 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -55,6 +55,13 @@ interface IServerContainer { */ function getPreviewManager(); + /** + * Returns the tag manager which can get and set tags for different object types + * + * @return \OCP\ITags + */ + function getTagManager(); + /** * Returns the root folder of ownCloud's data directory * diff --git a/lib/public/itags.php b/lib/public/itags.php new file mode 100644 index 00000000000..047d4f5f40b --- /dev/null +++ b/lib/public/itags.php @@ -0,0 +1,173 @@ + +* +* 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 . +* +*/ + +namespace OCP; + +// FIXME: Where should I put this? Or should it be implemented as a Listener? +\OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Tags', 'post_deleteUser'); + +/** + * Class for easily tagging objects by their id + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +interface ITags { + + /** + * Load tags from db. + * + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function loadTagsFor($type, $defaultTags=array()); + + /** + * Check if any tags are saved for this type and user. + * + * @return boolean. + */ + public function isEmpty(); + + /** + * Get the tags for a specific user. + * + * This returns an array with id/name maps: + * [ + * ['id' => 0, 'name' = 'First tag'], + * ['id' => 1, 'name' = 'Second tag'], + * ] + * + * @returns array + */ + public function tags(); + + /** + * Get the a list if items tagged with $tag. + * + * Throws an exception if the tag could not be found. + * + * @param string|integer $tag Tag id or name. + * @return array An array of object ids or false on error. + */ + public function idsForTag($tag); + + /** + * Checks whether a tag is already saved. + * + * @param string $name The name to check for. + * @return bool + */ + public function hasTag($name); + + /** + * Add a new tag. + * + * @param string $name A string with a name of the tag + * @return int the id of the added tag or false if it already exists. + */ + public function add($name); + + /** + * Rename tag. + * + * @param string $from The name of the existing tag + * @param string $to The new name of the tag. + * @return bool + */ + public function rename($from, $to); + + /** + * Add a list of new tags. + * + * @param string[] $names A string with a name or an array of strings containing + * the name(s) of the to add. + * @param bool $sync When true, save the tags + * @param int|null $id int Optional object id to add to this|these tag(s) + * @return bool Returns false on error. + */ + public function addMulti($names, $sync=false, $id = null); + + /** + * Delete tag/object relations from the db + * + * @param array $ids The ids of the objects + * @return boolean Returns false on error. + */ + public function purgeObjects(array $ids); + + /** + * Get favorites for an object type + * + * @return array An array of object ids. + */ + public function getFavorites(); + + /** + * Add an object to favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function addToFavorites($objid); + + /** + * Remove an object from favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function removeFromFavorites($objid); + + /** + * Creates a tag/object relation. + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean Returns false on database error. + */ + public function tagAs($objid, $tag); + + /** + * Delete single tag/object relation from the db + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean + */ + public function unTag($objid, $tag); + + /** + * Delete tags from the + * + * @param string[] $names An array of tags to delete + * @return bool Returns false on error + */ + public function delete($names); + +} \ No newline at end of file diff --git a/lib/server.php b/lib/server.php index 804af6b0eac..b09d380b0e9 100644 --- a/lib/server.php +++ b/lib/server.php @@ -49,8 +49,11 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('PreviewManager', function($c) { return new PreviewManager(); }); - $this->registerService('RootFolder', function($c) { - // TODO: get user from container as well + $this->registerService('TagManager', function($c){ + return new Tags(); + }); + $this->registerService('RootFolder', function($c){ + // TODO: get user and user manager from container as well $user = \OC_User::getUser(); /** @var $c SimpleContainer */ $userManager = $c->query('UserManager'); @@ -139,6 +142,15 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('PreviewManager'); } + /** + * Returns the tag manager which can get and set tags for different object types + * + * @return \OCP\ITags + */ + function getTagManager() { + return $this->query('TagManager'); + } + /** * Returns the root folder of ownCloud's data directory * diff --git a/lib/tags.php b/lib/tags.php new file mode 100644 index 00000000000..4aafff8e1bb --- /dev/null +++ b/lib/tags.php @@ -0,0 +1,621 @@ + +* @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 for easily tagging objects by their id + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +namespace OC; + +class Tags implements \OCP\ITags { + + /** + * Tags + */ + private $tags = array(); + + /** + * Used for storing objectid/categoryname pairs while rescanning. + */ + private static $relations = array(); + + private $type = null; + private $user = null; + + const TAG_TABLE = '*PREFIX*vcategory'; + const RELATION_TABLE = '*PREFIX*vcategory_to_object'; + + const TAG_FAVORITE = '_$!!$_'; + + /** + * Constructor. + * + * @param string $user The user whos data the object will operate on. + */ + public function __construct($user) { + + $this->user = $user; + + } + + /** + * Load tags from db. + * + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function loadTagsFor($type, $defaultTags=array()) { + $this->type = $type; + $this->tags = array(); + $result = null; + $sql = 'SELECT `id`, `category` FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`'; + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($this->user, $this->type)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + + if(!is_null($result)) { + while( $row = $result->fetchRow()) { + $this->tags[$row['id']] = $row['category']; + } + } + + if(count($defaultTags) > 0 && count($this->tags) === 0) { + $this->addMulti($defaultTags, true); + } + \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true), + \OCP\Util::DEBUG); + + return $this; + } + + /** + * Check if any tags are saved for this type and user. + * + * @return boolean. + */ + public function isEmpty() { + $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ? AND `type` = ?'; + try { + $stmt = OCP\DB::prepare($sql); + $result = $stmt->execute(array($this->user, $this->type)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + return ($result->numRows() === 0); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + } + + /** + * Get the tags for a specific user. + * + * This returns an array with id/name maps: + * [ + * ['id' => 0, 'name' = 'First tag'], + * ['id' => 1, 'name' = 'Second tag'], + * ] + * + * @return array + */ + public function tags() { + if(!count($this->tags)) { + return array(); + } + + $tags = array_values($this->tags); + uasort($tags, 'strnatcasecmp'); + $tagMap = array(); + + foreach($tags as $tag) { + if($tag !== self::TAG_FAVORITE) { + $tagMap[] = array( + 'id' => $this->array_searchi($tag, $this->tags), + 'name' => $tag + ); + } + } + return $tagMap; + + } + + /** + * Get the a list if items tagged with $tag. + * + * Throws an exception if the tag could not be found. + * + * @param string|integer $tag Tag id or name. + * @return array An array of object ids or false on error. + */ + public function idsForTag($tag) { + $result = null; + if(is_numeric($tag)) { + $tagId = $tag; + } elseif(is_string($tag)) { + $tag = trim($tag); + $tagId = $this->array_searchi($tag, $this->tags); + } + + if($tagId === false) { + $l10n = \OC_L10N::get('core'); + throw new \Exception( + $l10n->t('Could not find category "%s"', $tag) + ); + } + + $ids = array(); + $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE + . '` WHERE `categoryid` = ?'; + + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($tagId)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + + if(!is_null($result)) { + while( $row = $result->fetchRow()) { + $ids[] = (int)$row['objid']; + } + } + + return $ids; + } + + /** + * Checks whether a tag is already saved. + * + * @param string $name The name to check for. + * @return bool + */ + public function hasTag($name) { + return $this->in_arrayi($name, $this->tags); + } + + /** + * Add a new tag. + * + * @param string $name A string with a name of the tag + * @return int the id of the added tag or false if it already exists. + */ + public function add($name) { + $name = trim($name); + + if($this->hasTag($name)) { + \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG); + return false; + } + try { + \OCP\DB::insertIfNotExist(self::TAG_TABLE, + array( + 'uid' => $this->user, + 'type' => $this->type, + 'category' => $name, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + $id = \OCP\DB::insertid(self::TAG_TABLE); + \OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG); + $this->tags[$id] = $name; + return $id; + } + + /** + * Rename tag. + * + * @param string $from The name of the existing tag + * @param string $to The new name of the tag. + * @return bool + */ + public function rename($from, $to) { + $from = trim($from); + $to = trim($to); + $id = $this->array_searchi($from, $this->tags); + if($id === false) { + \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG); + return false; + } + + $sql = 'UPDATE `' . self::TAG_TABLE . '` SET `category` = ? ' + . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?'; + try { + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($to, $this->user, $this->type, $id)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + $this->tags[$id] = $to; + return true; + } + + /** + * Add a list of new tags. + * + * @param string[] $names A string with a name or an array of strings containing + * the name(s) of the to add. + * @param bool $sync When true, save the tags + * @param int|null $id int Optional object id to add to this|these tag(s) + * @return bool Returns false on error. + */ + public function addMulti($names, $sync=false, $id = null) { + if(!is_array($names)) { + $names = array($names); + } + $names = array_map('trim', $names); + $newones = array(); + foreach($names as $name) { + if(($this->in_arrayi( + $name, $this->tags) == false) && $name !== '') { + $newones[] = $name; + } + if(!is_null($id) ) { + // Insert $objectid, $categoryid pairs if not exist. + self::$relations[] = array('objid' => $id, 'tag' => $name); + } + } + $this->tags = array_merge($this->tags, $newones); + if($sync === true) { + $this->save(); + } + + return true; + } + + /** + * Save the list of tags and their object relations + */ + protected function save() { + if(is_array($this->tags)) { + foreach($this->tags as $tag) { + try { + \OCP\DB::insertIfNotExist(self::TAG_TABLE, + array( + 'uid' => $this->user, + 'type' => $this->type, + 'category' => $tag, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + // reload tags to get the proper ids. + $this->loadTagsFor($this->type); + // Loop through temporarily cached objectid/tagname pairs + // and save relations. + $tags = $this->tags; + // For some reason this is needed or array_search(i) will return 0..? + ksort($tags); + foreach(self::$relations as $relation) { + $tagId = $this->array_searchi($relation['tag'], $tags); + \OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG); + if($tagId) { + try { + \OCP\DB::insertIfNotExist(self::RELATION_TABLE, + array( + 'objid' => $relation['objid'], + 'categoryid' => $tagId, + 'type' => $this->type, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + } + self::$relations = array(); // reset + } else { + \OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! ' + . print_r($this->tags, true), \OCP\Util::ERROR); + } + } + + /** + * Delete tags and tag/object relations for a user. + * + * For hooking up on post_deleteUser + * + * @param array + */ + public static function post_deleteUser($arguments) { + // Find all objectid/tagId pairs. + $result = null; + try { + $stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ?'); + $result = $stmt->execute(array($arguments['uid'])); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + + if(!is_null($result)) { + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `categoryid` = ?'); + while( $row = $result->fetchRow()) { + try { + $stmt->execute(array($row['id'])); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + } + } + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' + . 'WHERE `uid` = ?'); + $result = $stmt->execute(array($arguments['uid'])); + if (OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), OCP\Util::ERROR); + } + } + + /** + * Delete tag/object relations from the db + * + * @param array $ids The ids of the objects + * @return boolean Returns false on error. + */ + public function purgeObjects(array $ids) { + if(count($ids) === 0) { + // job done ;) + return true; + } + $updates = $ids; + try { + $query = 'DELETE FROM `' . self::RELATION_TABLE . '` '; + $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; + $query .= 'AND `type`= ?'; + $updates[] = $this->type; + $stmt = OCP\DB::prepare($query); + $result = $stmt->execute($updates); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Get favorites for an object type + * + * @return array An array of object ids. + */ + public function getFavorites() { + try { + return $this->idsForTag(self::TAG_FAVORITE); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), + \OCP\Util::ERROR); + return array(); + } + } + + /** + * Add an object to favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function addToFavorites($objid) { + if(!$this->hasCategory(self::TAG_FAVORITE)) { + $this->add(self::TAG_FAVORITE, true); + } + return $this->tagAs($objid, self::TAG_FAVORITE, $this->type); + } + + /** + * Remove an object from favorites + * + * @param int $objid The id of the object + * @return boolean + */ + public function removeFromFavorites($objid) { + return $this->unTag($objid, self::TAG_FAVORITE, $this->type); + } + + /** + * Creates a tag/object relation. + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean Returns false on database error. + */ + public function tagAs($objid, $tag) { + if(is_string($tag) && !is_numeric($tag)) { + $tag = trim($tag); + if(!$this->hasTag($tag)) { + $this->add($tag, true); + } + $tagId = $this->array_searchi($tag, $this->tags); + } else { + $tagId = $tag; + } + try { + \OCP\DB::insertIfNotExist(self::RELATION_TABLE, + array( + 'objid' => $objid, + 'categoryid' => $tagId, + 'type' => $this->type, + )); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Delete single tag/object relation from the db + * + * @param int $objid The id of the object + * @param int|string $tag The id or name of the tag + * @return boolean + */ + public function unTag($objid, $tag) { + if(is_string($tag) && !is_numeric($tag)) { + $tag = trim($tag); + $tagId = $this->array_searchi($tag, $this->tags); + } else { + $tagId = $tag; + } + + try { + $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; + $stmt = \OCP\DB::prepare($sql); + $stmt->execute(array($objid, $tagId, $this->type)); + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + return true; + } + + /** + * Delete tags from the + * + * @param string[] $names An array of tags to delete + * @return bool Returns false on error + */ + public function delete($names) { + if(!is_array($names)) { + $names = array($names); + } + + $names = array_map('trim', $names); + + \OCP\Util::writeLog('core', __METHOD__ . ', before: ' + . print_r($this->tags, true), \OCP\Util::DEBUG); + foreach($names as $name) { + $id = null; + + if($this->hasTag($name)) { + $id = $this->array_searchi($name, $this->tags); + unset($this->tags[$id]); + } + try { + $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` WHERE ' + . '`uid` = ? AND `type` = ? AND `category` = ?'); + $result = $stmt->execute(array($this->user, $this->type, $name)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), \OCP\Util::ERROR); + return false; + } + if(!is_null($id) && $id !== false) { + try { + $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' + . 'WHERE `categoryid` = ?'; + $stmt = \OCP\DB::prepare($sql); + $result = $stmt->execute(array($id)); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', + __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), + \OCP\Util::ERROR); + return false; + } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } + } + } + return true; + } + + // case-insensitive in_array + private function in_arrayi($needle, $haystack) { + if(!is_array($haystack)) { + return false; + } + return in_array(strtolower($needle), array_map('strtolower', $haystack)); + } + + // case-insensitive array_search + private function array_searchi($needle, $haystack) { + if(!is_array($haystack)) { + return false; + } + return array_search(strtolower($needle), array_map('strtolower', $haystack)); + } +} diff --git a/lib/vcategories.php b/lib/vcategories.php deleted file mode 100644 index a7e4c54be29..00000000000 --- a/lib/vcategories.php +++ /dev/null @@ -1,833 +0,0 @@ - -* @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 . -* -*/ - -OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_VCategories', 'post_deleteUser'); - -/** - * Class for easy access to categories in VCARD, VEVENT, VTODO and VJOURNAL. - * A Category can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or - * anything else that is either parsed from a vobject or that the user chooses - * to add. - * Category names are not case-sensitive, but will be saved with the case they - * are entered in. If a user already has a category 'family' for a type, and - * tries to add a category named 'Family' it will be silently ignored. - */ -class OC_VCategories { - - /** - * Categories - */ - private $categories = array(); - - /** - * Used for storing objectid/categoryname pairs while rescanning. - */ - private static $relations = array(); - - private $type = null; - private $user = null; - - const CATEGORY_TABLE = '*PREFIX*vcategory'; - const RELATION_TABLE = '*PREFIX*vcategory_to_object'; - - const CATEGORY_FAVORITE = '_$!!$_'; - - const FORMAT_LIST = 0; - const FORMAT_MAP = 1; - - /** - * @brief Constructor. - * @param $type The type identifier e.g. 'contact' or 'event'. - * @param $user The user whos data the object will operate on. This - * parameter should normally be omitted but to make an app able to - * update categories for all users it is made possible to provide it. - * @param $defcategories An array of default categories to be used if none is stored. - */ - public function __construct($type, $user=null, $defcategories=array()) { - $this->type = $type; - $this->user = is_null($user) ? OC_User::getUser() : $user; - - $this->loadCategories(); - OCP\Util::writeLog('core', __METHOD__ . ', categories: ' - . print_r($this->categories, true), - OCP\Util::DEBUG - ); - - if($defcategories && count($this->categories) === 0) { - $this->addMulti($defcategories, true); - } - } - - /** - * @brief Load categories from db. - */ - private function loadCategories() { - $this->categories = array(); - $result = null; - $sql = 'SELECT `id`, `category` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - // The keys are prefixed because array_search wouldn't work otherwise :-/ - $this->categories[$row['id']] = $row['category']; - } - } - OCP\Util::writeLog('core', __METHOD__.', categories: ' . print_r($this->categories, true), - OCP\Util::DEBUG); - } - - - /** - * @brief Check if any categories are saved for this type and user. - * @returns boolean. - * @param $type The type identifier e.g. 'contact' or 'event'. - * @param $user The user whos categories will be checked. If not set current user will be used. - */ - public static function isEmpty($type, $user = null) { - $user = is_null($user) ? OC_User::getUser() : $user; - $sql = 'SELECT COUNT(*) FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($user, $type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - return ($result->numRows() === 0); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - } - - /** - * @brief Get the categories for a specific user. - * @param - * @returns array containing the categories as strings. - */ - public function categories($format = null) { - if(!$this->categories) { - return array(); - } - $categories = array_values($this->categories); - uasort($categories, 'strnatcasecmp'); - if($format == self::FORMAT_MAP) { - $catmap = array(); - foreach($categories as $category) { - if($category !== self::CATEGORY_FAVORITE) { - $catmap[] = array( - 'id' => $this->array_searchi($category, $this->categories), - 'name' => $category - ); - } - } - return $catmap; - } - - // Don't add favorites to normal categories. - $favpos = array_search(self::CATEGORY_FAVORITE, $categories); - if($favpos !== false) { - return array_splice($categories, $favpos); - } else { - return $categories; - } - } - - /** - * Get the a list if items belonging to $category. - * - * Throws an exception if the category could not be found. - * - * @param string|integer $category Category id or name. - * @returns array An array of object ids or false on error. - */ - public function idsForCategory($category) { - $result = null; - if(is_numeric($category)) { - $catid = $category; - } elseif(is_string($category)) { - $category = trim($category); - $catid = $this->array_searchi($category, $this->categories); - } - OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); - if($catid === false) { - $l10n = OC_L10N::get('core'); - throw new Exception( - $l10n->t('Could not find category "%s"', $category) - ); - } - - $ids = array(); - $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE - . '` WHERE `categoryid` = ?'; - - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($catid)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - $ids[] = (int)$row['objid']; - } - } - - return $ids; - } - - /** - * Get the a list if items belonging to $category. - * - * Throws an exception if the category could not be found. - * - * @param string|integer $category Category id or name. - * @param array $tableinfo Array in the form {'tablename' => table, 'fields' => ['field1', 'field2']} - * @param int $limit - * @param int $offset - * - * This generic method queries a table assuming that the id - * field is called 'id' and the table name provided is in - * the form '*PREFIX*table_name'. - * - * If the category name cannot be resolved an exception is thrown. - * - * TODO: Maybe add the getting permissions for objects? - * - * @returns array containing the resulting items or false on error. - */ - public function itemsForCategory($category, $tableinfo, $limit = null, $offset = null) { - $result = null; - if(is_numeric($category)) { - $catid = $category; - } elseif(is_string($category)) { - $category = trim($category); - $catid = $this->array_searchi($category, $this->categories); - } - OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG); - if($catid === false) { - $l10n = OC_L10N::get('core'); - throw new Exception( - $l10n->t('Could not find category "%s"', $category) - ); - } - $fields = ''; - foreach($tableinfo['fields'] as $field) { - $fields .= '`' . $tableinfo['tablename'] . '`.`' . $field . '`,'; - } - $fields = substr($fields, 0, -1); - - $items = array(); - $sql = 'SELECT `' . self::RELATION_TABLE . '`.`categoryid`, ' . $fields - . ' FROM `' . $tableinfo['tablename'] . '` JOIN `' - . self::RELATION_TABLE . '` ON `' . $tableinfo['tablename'] - . '`.`id` = `' . self::RELATION_TABLE . '`.`objid` WHERE `' - . self::RELATION_TABLE . '`.`categoryid` = ?'; - - try { - $stmt = OCP\DB::prepare($sql, $limit, $offset); - $result = $stmt->execute(array($catid)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - - if(!is_null($result)) { - while( $row = $result->fetchRow()) { - $items[] = $row; - } - } - //OCP\Util::writeLog('core', __METHOD__.', count: ' . count($items), OCP\Util::DEBUG); - //OCP\Util::writeLog('core', __METHOD__.', sql: ' . $sql, OCP\Util::DEBUG); - - return $items; - } - - /** - * @brief Checks whether a category is already saved. - * @param $name The name to check for. - * @returns bool - */ - public function hasCategory($name) { - return $this->in_arrayi($name, $this->categories); - } - - /** - * @brief Add a new category. - * @param $name A string with a name of the category - * @returns int the id of the added category or false if it already exists. - */ - public function add($name) { - $name = trim($name); - OCP\Util::writeLog('core', __METHOD__.', name: ' . $name, OCP\Util::DEBUG); - if($this->hasCategory($name)) { - OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG); - return false; - } - try { - OCP\DB::insertIfNotExist(self::CATEGORY_TABLE, - array( - 'uid' => $this->user, - 'type' => $this->type, - 'category' => $name, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - $id = OCP\DB::insertid(self::CATEGORY_TABLE); - OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, OCP\Util::DEBUG); - $this->categories[$id] = $name; - return $id; - } - - /** - * @brief Rename category. - * @param string $from The name of the existing category - * @param string $to The new name of the category. - * @returns bool - */ - public function rename($from, $to) { - $from = trim($from); - $to = trim($to); - $id = $this->array_searchi($from, $this->categories); - if($id === false) { - OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG); - return false; - } - - $sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? ' - . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?'; - try { - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($to, $this->user, $this->type, $id)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - $this->categories[$id] = $to; - return true; - } - - /** - * @brief Add a new category. - * @param $names A string with a name or an array of strings containing - * the name(s) of the categor(y|ies) to add. - * @param $sync bool When true, save the categories - * @param $id int Optional object id to add to this|these categor(y|ies) - * @returns bool Returns false on error. - */ - public function addMulti($names, $sync=false, $id = null) { - if(!is_array($names)) { - $names = array($names); - } - $names = array_map('trim', $names); - $newones = array(); - foreach($names as $name) { - if(($this->in_arrayi( - $name, $this->categories) == false) && $name != '') { - $newones[] = $name; - } - if(!is_null($id) ) { - // Insert $objectid, $categoryid pairs if not exist. - self::$relations[] = array('objid' => $id, 'category' => $name); - } - } - $this->categories = array_merge($this->categories, $newones); - if($sync === true) { - $this->save(); - } - - return true; - } - - /** - * @brief Extracts categories from a vobject and add the ones not already present. - * @param $vobject The instance of OC_VObject to load the categories from. - */ - public function loadFromVObject($id, $vobject, $sync=false) { - $this->addMulti($vobject->getAsArray('CATEGORIES'), $sync, $id); - } - - /** - * @brief Reset saved categories and rescan supplied vobjects for categories. - * @param $objects An array of vobjects (as text). - * To get the object array, do something like: - * // For Addressbook: - * $categories = new OC_VCategories('contacts'); - * $stmt = OC_DB::prepare( 'SELECT `carddata` FROM `*PREFIX*contacts_cards`' ); - * $result = $stmt->execute(); - * $objects = array(); - * if(!is_null($result)) { - * while( $row = $result->fetchRow()){ - * $objects[] = array($row['id'], $row['carddata']); - * } - * } - * $categories->rescan($objects); - */ - public function rescan($objects, $sync=true, $reset=true) { - - if($reset === true) { - $result = null; - // Find all objectid/categoryid pairs. - try { - $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - // And delete them. - if(!is_null($result)) { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ? AND `type`= ?'); - while( $row = $result->fetchRow()) { - $stmt->execute(array($row['id'], $this->type)); - } - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'); - $result = $stmt->execute(array($this->user, $this->type)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - return; - } - $this->categories = array(); - } - // Parse all the VObjects - foreach($objects as $object) { - $vobject = OC_VObject::parse($object[1]); - if(!is_null($vobject)) { - // Load the categories - $this->loadFromVObject($object[0], $vobject, $sync); - } else { - OC_Log::write('core', __METHOD__ . ', unable to parse. ID: ' . ', ' - . substr($object, 0, 100) . '(...)', OC_Log::DEBUG); - } - } - $this->save(); - } - - /** - * @brief Save the list with categories - */ - private function save() { - if(is_array($this->categories)) { - foreach($this->categories as $category) { - try { - OCP\DB::insertIfNotExist(self::CATEGORY_TABLE, - array( - 'uid' => $this->user, - 'type' => $this->type, - 'category' => $category, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - // reload categories to get the proper ids. - $this->loadCategories(); - // Loop through temporarily cached objectid/categoryname pairs - // and save relations. - $categories = $this->categories; - // For some reason this is needed or array_search(i) will return 0..? - ksort($categories); - foreach(self::$relations as $relation) { - $catid = $this->array_searchi($relation['category'], $categories); - OC_Log::write('core', __METHOD__ . 'catid, ' . $relation['category'] . ' ' . $catid, OC_Log::DEBUG); - if($catid) { - try { - OCP\DB::insertIfNotExist(self::RELATION_TABLE, - array( - 'objid' => $relation['objid'], - 'categoryid' => $catid, - 'type' => $this->type, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - } - self::$relations = array(); // reset - } else { - OC_Log::write('core', __METHOD__.', $this->categories is not an array! ' - . print_r($this->categories, true), OC_Log::ERROR); - } - } - - /** - * @brief Delete categories and category/object relations for a user. - * For hooking up on post_deleteUser - * @param string $uid The user id for which entries should be purged. - */ - public static function post_deleteUser($arguments) { - // Find all objectid/categoryid pairs. - $result = null; - try { - $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ?'); - $result = $stmt->execute(array($arguments['uid'])); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - - if(!is_null($result)) { - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ?'); - while( $row = $result->fetchRow()) { - try { - $stmt->execute(array($row['id'])); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - } - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` ' - . 'WHERE `uid` = ?'); - $result = $stmt->execute(array($arguments['uid'])); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - } - } - - /** - * @brief Delete category/object relations from the db - * @param array $ids The ids of the objects - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean Returns false on error. - */ - public function purgeObjects(array $ids, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(count($ids) === 0) { - // job done ;) - return true; - } - $updates = $ids; - try { - $query = 'DELETE FROM `' . self::RELATION_TABLE . '` '; - $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; - $query .= 'AND `type`= ?'; - $updates[] = $type; - $stmt = OCP\DB::prepare($query); - $result = $stmt->execute($updates); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * Get favorites for an object type - * - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns array An array of object ids. - */ - public function getFavorites($type = null) { - $type = is_null($type) ? $this->type : $type; - - try { - return $this->idsForCategory(self::CATEGORY_FAVORITE); - } catch(Exception $e) { - // No favorites - return array(); - } - } - - /** - * Add an object to favorites - * - * @param int $objid The id of the object - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function addToFavorites($objid, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(!$this->hasCategory(self::CATEGORY_FAVORITE)) { - $this->add(self::CATEGORY_FAVORITE, true); - } - return $this->addToCategory($objid, self::CATEGORY_FAVORITE, $type); - } - - /** - * Remove an object from favorites - * - * @param int $objid The id of the object - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function removeFromFavorites($objid, $type = null) { - $type = is_null($type) ? $this->type : $type; - return $this->removeFromCategory($objid, self::CATEGORY_FAVORITE, $type); - } - - /** - * @brief Creates a category/object relation. - * @param int $objid The id of the object - * @param int|string $category The id or name of the category - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean Returns false on database error. - */ - public function addToCategory($objid, $category, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(is_string($category) && !is_numeric($category)) { - $category = trim($category); - if(!$this->hasCategory($category)) { - $this->add($category, true); - } - $categoryid = $this->array_searchi($category, $this->categories); - } else { - $categoryid = $category; - } - try { - OCP\DB::insertIfNotExist(self::RELATION_TABLE, - array( - 'objid' => $objid, - 'categoryid' => $categoryid, - 'type' => $type, - )); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * @brief Delete single category/object relation from the db - * @param int $objid The id of the object - * @param int|string $category The id or name of the category - * @param string $type The type of object (event/contact/task/journal). - * Defaults to the type set in the instance - * @returns boolean - */ - public function removeFromCategory($objid, $category, $type = null) { - $type = is_null($type) ? $this->type : $type; - if(is_string($category) && !is_numeric($category)) { - $category = trim($category); - $categoryid = $this->array_searchi($category, $this->categories); - } else { - $categoryid = $category; - } - - try { - $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?'; - OCP\Util::writeLog('core', __METHOD__.', sql: ' . $objid . ' ' . $categoryid . ' ' . $type, - OCP\Util::DEBUG); - $stmt = OCP\DB::prepare($sql); - $stmt->execute(array($objid, $categoryid, $type)); - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - return true; - } - - /** - * @brief Delete categories from the db and from all the vobject supplied - * @param $names An array of categories to delete - * @param $objects An array of arrays with [id,vobject] (as text) pairs suitable for updating the apps object table. - */ - public function delete($names, array &$objects=null) { - if(!is_array($names)) { - $names = array($names); - } - - $names = array_map('trim', $names); - - OC_Log::write('core', __METHOD__ . ', before: ' - . print_r($this->categories, true), OC_Log::DEBUG); - foreach($names as $name) { - $id = null; - OC_Log::write('core', __METHOD__.', '.$name, OC_Log::DEBUG); - if($this->hasCategory($name)) { - $id = $this->array_searchi($name, $this->categories); - unset($this->categories[$id]); - } - try { - $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` WHERE ' - . '`uid` = ? AND `type` = ? AND `category` = ?'); - $result = $stmt->execute(array($this->user, $this->type, $name)); - if (OC_DB::isError($result)) { - OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); - } - if(!is_null($id) && $id !== false) { - try { - $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` ' - . 'WHERE `categoryid` = ?'; - $stmt = OCP\DB::prepare($sql); - $result = $stmt->execute(array($id)); - if (OC_DB::isError($result)) { - OC_Log::write('core', - __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), - OC_Log::ERROR); - } - } catch(Exception $e) { - OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - OCP\Util::ERROR); - return false; - } - } - } - OC_Log::write('core', __METHOD__.', after: ' - . print_r($this->categories, true), OC_Log::DEBUG); - if(!is_null($objects)) { - foreach($objects as $key=>&$value) { - $vobject = OC_VObject::parse($value[1]); - if(!is_null($vobject)) { - $object = null; - $componentname = ''; - if (isset($vobject->VEVENT)) { - $object = $vobject->VEVENT; - $componentname = 'VEVENT'; - } else - if (isset($vobject->VTODO)) { - $object = $vobject->VTODO; - $componentname = 'VTODO'; - } else - if (isset($vobject->VJOURNAL)) { - $object = $vobject->VJOURNAL; - $componentname = 'VJOURNAL'; - } else { - $object = $vobject; - } - $categories = $object->getAsArray('CATEGORIES'); - foreach($names as $name) { - $idx = $this->array_searchi($name, $categories); - if($idx !== false) { - OC_Log::write('core', __METHOD__ - .', unsetting: ' - . $categories[$this->array_searchi($name, $categories)], - OC_Log::DEBUG); - unset($categories[$this->array_searchi($name, $categories)]); - } - } - - $object->setString('CATEGORIES', implode(',', $categories)); - if($vobject !== $object) { - $vobject[$componentname] = $object; - } - $value[1] = $vobject->serialize(); - $objects[$key] = $value; - } else { - OC_Log::write('core', __METHOD__ - .', unable to parse. ID: ' . $value[0] . ', ' - . substr($value[1], 0, 50) . '(...)', OC_Log::DEBUG); - } - } - } - } - - // case-insensitive in_array - private function in_arrayi($needle, $haystack) { - if(!is_array($haystack)) { - return false; - } - return in_array(strtolower($needle), array_map('strtolower', $haystack)); - } - - // case-insensitive array_search - private function array_searchi($needle, $haystack) { - if(!is_array($haystack)) { - return false; - } - return array_search(strtolower($needle), array_map('strtolower', $haystack)); - } -} diff --git a/tests/lib/tags.php b/tests/lib/tags.php new file mode 100644 index 00000000000..06baebc0af7 --- /dev/null +++ b/tests/lib/tags.php @@ -0,0 +1,133 @@ +. +* +*/ + +class Test_Tags extends PHPUnit_Framework_TestCase { + + protected $objectType; + protected $user; + protected $backupGlobals = FALSE; + + public function setUp() { + + OC_User::clearBackends(); + OC_User::useBackend('dummy'); + $this->user = uniqid('user_'); + $this->objectType = uniqid('type_'); + OC_User::createUser($this->user, 'pass'); + OC_User::setUserId($this->user); + + } + + public function tearDown() { + //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?'); + //$query->execute(array('test')); + } + + public function testInstantiateWithDefaults() { + $defaultTags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertEquals(4, count($tagMgr->tags())); + } + + public function testAddTags() { + $tags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($tags as $tag) { + $result = $tagMgr->add($tag); + $this->assertTrue((bool)$result); + } + + $this->assertFalse($tagMgr->add('Family')); + $this->assertFalse($tagMgr->add('fAMILY')); + + $this->assertEquals(4, count($tagMgr->tags())); + } + + public function testdeleteTags() { + $defaultTags = array('Friends', 'Family', 'Work', 'Other'); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertEquals(4, count($tagMgr->tags())); + + $tagMgr->delete('family'); + $this->assertEquals(3, count($tagMgr->tags())); + + $tagMgr->delete(array('Friends', 'Work', 'Other')); + $this->assertEquals(0, count($tagMgr->tags())); + + } + + public function testRenameTag() { + $defaultTags = array('Friends', 'Family', 'Wrok', 'Other'); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType, $defaultTags); + + $this->assertTrue($tagMgr->rename('Wrok', 'Work')); + $this->assertTrue($tagMgr->hasTag('Work')); + $this->assertFalse($tagMgr->hastag('Wrok')); + $this->assertFalse($tagMgr->rename('Wrok', 'Work')); + + } + + public function testTagAs() { + $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($objids as $id) { + $tagMgr->tagAs($id, 'Family'); + } + + $this->assertEquals(1, count($tagMgr->tags())); + $this->assertEquals(9, count($tagMgr->idsForTag('Family'))); + } + + /** + * @depends testTagAs + */ + public function testUnTag() { + $objIds = array(1, 2, 3, 4, 5, 6, 7, 8, 9); + + // Is this "legal"? + $this->testTagAs(); + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($objIds as $id) { + $this->assertTrue(in_array($id, $tagMgr->idsForTag('Family'))); + $tagMgr->unTag($id, 'Family'); + $this->assertFalse(in_array($id, $tagMgr->idsForTag('Family'))); + } + + $this->assertEquals(1, count($tagMgr->tags())); + $this->assertEquals(0, count($tagMgr->idsForTag('Family'))); + } + +} diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php deleted file mode 100644 index df5f600f20d..00000000000 --- a/tests/lib/vcategories.php +++ /dev/null @@ -1,128 +0,0 @@ -. -* -*/ - -//require_once("../lib/template.php"); - -class Test_VCategories extends PHPUnit_Framework_TestCase { - - protected $objectType; - protected $user; - protected $backupGlobals = FALSE; - - public function setUp() { - - OC_User::clearBackends(); - OC_User::useBackend('dummy'); - $this->user = uniqid('user_'); - $this->objectType = uniqid('type_'); - OC_User::createUser($this->user, 'pass'); - OC_User::setUserId($this->user); - - } - - public function tearDown() { - //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?'); - //$query->execute(array('test')); - } - - public function testInstantiateWithDefaults() { - $defcategories = array('Friends', 'Family', 'Work', 'Other'); - - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - - $this->assertEquals(4, count($catmgr->categories())); - } - - public function testAddCategories() { - $categories = array('Friends', 'Family', 'Work', 'Other'); - - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($categories as $category) { - $result = $catmgr->add($category); - $this->assertTrue((bool)$result); - } - - $this->assertFalse($catmgr->add('Family')); - $this->assertFalse($catmgr->add('fAMILY')); - - $this->assertEquals(4, count($catmgr->categories())); - } - - public function testdeleteCategories() { - $defcategories = array('Friends', 'Family', 'Work', 'Other'); - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - $this->assertEquals(4, count($catmgr->categories())); - - $catmgr->delete('family'); - $this->assertEquals(3, count($catmgr->categories())); - - $catmgr->delete(array('Friends', 'Work', 'Other')); - $this->assertEquals(0, count($catmgr->categories())); - - } - - public function testrenameCategory() { - $defcategories = array('Friends', 'Family', 'Wrok', 'Other'); - $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories); - - $this->assertTrue($catmgr->rename('Wrok', 'Work')); - $this->assertTrue($catmgr->hasCategory('Work')); - $this->assertFalse($catmgr->hasCategory('Wrok')); - $this->assertFalse($catmgr->rename('Wrok', 'Work')); - - } - - public function testAddToCategory() { - $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); - - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($objids as $id) { - $catmgr->addToCategory($id, 'Family'); - } - - $this->assertEquals(1, count($catmgr->categories())); - $this->assertEquals(9, count($catmgr->idsForCategory('Family'))); - } - - /** - * @depends testAddToCategory - */ - public function testRemoveFromCategory() { - $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); - - // Is this "legal"? - $this->testAddToCategory(); - $catmgr = new OC_VCategories($this->objectType, $this->user); - - foreach($objids as $id) { - $this->assertTrue(in_array($id, $catmgr->idsForCategory('Family'))); - $catmgr->removeFromCategory($id, 'Family'); - $this->assertFalse(in_array($id, $catmgr->idsForCategory('Family'))); - } - - $this->assertEquals(1, count($catmgr->categories())); - $this->assertEquals(0, count($catmgr->idsForCategory('Family'))); - } - -} -- cgit v1.2.3 From b63acdb12599c4ad062d7509c0079fad0b1ccfa2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 18 Sep 2013 22:49:09 +0200 Subject: fixing namespaces and rename hasCategory to hasTag --- lib/tags.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 4aafff8e1bb..3320d9ea1a8 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -113,7 +113,7 @@ class Tags implements \OCP\ITags { $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ? AND `type` = ?'; try { - $stmt = OCP\DB::prepare($sql); + $stmt = \OCP\DB::prepare($sql); $result = $stmt->execute(array($this->user, $this->type)); if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); @@ -191,7 +191,7 @@ class Tags implements \OCP\ITags { $stmt = \OCP\DB::prepare($sql); $result = $stmt->execute(array($tagId)); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } } catch(\Exception $e) { @@ -381,7 +381,7 @@ class Tags implements \OCP\ITags { . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), @@ -409,12 +409,12 @@ class Tags implements \OCP\ITags { $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` ' . 'WHERE `uid` = ?'); $result = $stmt->execute(array($arguments['uid'])); - if (OCP\DB::isError($result)) { + if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { - OCP\Util::writeLog('core', __METHOD__ . ', exception: ' - . $e->getMessage(), OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' + . $e->getMessage(), \OCP\Util::ERROR); } } @@ -435,7 +435,7 @@ class Tags implements \OCP\ITags { $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) '; $query .= 'AND `type`= ?'; $updates[] = $this->type; - $stmt = OCP\DB::prepare($query); + $stmt = \OCP\DB::prepare($query); $result = $stmt->execute($updates); if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); @@ -471,7 +471,7 @@ class Tags implements \OCP\ITags { * @return boolean */ public function addToFavorites($objid) { - if(!$this->hasCategory(self::TAG_FAVORITE)) { + if(!$this->hasTag(self::TAG_FAVORITE)) { $this->add(self::TAG_FAVORITE, true); } return $this->tagAs($objid, self::TAG_FAVORITE, $this->type); @@ -574,7 +574,7 @@ class Tags implements \OCP\ITags { . '`uid` = ? AND `type` = ? AND `category` = ?'); $result = $stmt->execute(array($this->user, $this->type, $name)); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__ . ', exception: ' -- cgit v1.2.3 From 1bbeb12e2e8acc47b94c23d6a17332fb45c2a97e Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Thu, 19 Sep 2013 11:27:13 +0200 Subject: Updated method names and added a few more tests. --- lib/public/itags.php | 6 +++--- lib/tags.php | 12 +++++------ tests/lib/tags.php | 59 ++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 57 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/public/itags.php b/lib/public/itags.php index 047d4f5f40b..12643400548 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -65,7 +65,7 @@ interface ITags { * * @returns array */ - public function tags(); + public function getTags(); /** * Get the a list if items tagged with $tag. @@ -75,7 +75,7 @@ interface ITags { * @param string|integer $tag Tag id or name. * @return array An array of object ids or false on error. */ - public function idsForTag($tag); + public function getIdsForTag($tag); /** * Checks whether a tag is already saved. @@ -111,7 +111,7 @@ interface ITags { * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. */ - public function addMulti($names, $sync=false, $id = null); + public function addMultiple($names, $sync=false, $id = null); /** * Delete tag/object relations from the db diff --git a/lib/tags.php b/lib/tags.php index 3320d9ea1a8..2eaa603c1a3 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -96,7 +96,7 @@ class Tags implements \OCP\ITags { } if(count($defaultTags) > 0 && count($this->tags) === 0) { - $this->addMulti($defaultTags, true); + $this->addMultiple($defaultTags, true); } \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true), \OCP\Util::DEBUG); @@ -119,7 +119,7 @@ class Tags implements \OCP\ITags { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } - return ($result->numRows() === 0); + return ((int)$result->numRows() === 0); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR); @@ -138,7 +138,7 @@ class Tags implements \OCP\ITags { * * @return array */ - public function tags() { + public function getTags() { if(!count($this->tags)) { return array(); } @@ -167,7 +167,7 @@ class Tags implements \OCP\ITags { * @param string|integer $tag Tag id or name. * @return array An array of object ids or false on error. */ - public function idsForTag($tag) { + public function getIdsForTag($tag) { $result = null; if(is_numeric($tag)) { $tagId = $tag; @@ -293,7 +293,7 @@ class Tags implements \OCP\ITags { * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. */ - public function addMulti($names, $sync=false, $id = null) { + public function addMultiple($names, $sync=false, $id = null) { if(!is_array($names)) { $names = array($names); } @@ -456,7 +456,7 @@ class Tags implements \OCP\ITags { */ public function getFavorites() { try { - return $this->idsForTag(self::TAG_FAVORITE); + return $this->getIdsForTag(self::TAG_FAVORITE); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(), \OCP\Util::ERROR); diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 06baebc0af7..16a03f5645a 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -48,7 +48,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr = new OC\Tags($this->user); $tagMgr->loadTagsFor($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); } public function testAddTags() { @@ -65,7 +65,37 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $this->assertFalse($tagMgr->add('Family')); $this->assertFalse($tagMgr->add('fAMILY')); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); + } + + public function testAddMultiple() { + $tags = array('Friends', 'Family', 'Work', 'Other'); + + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + foreach($tags as $tag) { + $this->assertFalse($tagMgr->hasTag($tag)); + } + + $result = $tagMgr->addMultiple($tags); + $this->assertTrue((bool)$result); + + foreach($tags as $tag) { + $this->assertTrue($tagMgr->hasTag($tag)); + } + + $this->assertEquals(4, count($tagMgr->getTags())); + } + + public function testIsEmpty() { + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + + $this->assertEquals(0, count($tagMgr->getTags())); + $this->assertTrue($tagMgr->isEmpty()); + $tagMgr->add('Tag'); + $this->assertFalse($tagMgr->isEmpty()); } public function testdeleteTags() { @@ -73,13 +103,13 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr = new OC\Tags($this->user); $tagMgr->loadTagsFor($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->tags())); + $this->assertEquals(4, count($tagMgr->getTags())); $tagMgr->delete('family'); - $this->assertEquals(3, count($tagMgr->tags())); + $this->assertEquals(3, count($tagMgr->getTags())); $tagMgr->delete(array('Friends', 'Work', 'Other')); - $this->assertEquals(0, count($tagMgr->tags())); + $this->assertEquals(0, count($tagMgr->getTags())); } @@ -105,8 +135,8 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr->tagAs($id, 'Family'); } - $this->assertEquals(1, count($tagMgr->tags())); - $this->assertEquals(9, count($tagMgr->idsForTag('Family'))); + $this->assertEquals(1, count($tagMgr->getTags())); + $this->assertEquals(9, count($tagMgr->getIdsForTag('Family'))); } /** @@ -121,13 +151,20 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagMgr->loadTagsFor($this->objectType); foreach($objIds as $id) { - $this->assertTrue(in_array($id, $tagMgr->idsForTag('Family'))); + $this->assertTrue(in_array($id, $tagMgr->getIdsForTag('Family'))); $tagMgr->unTag($id, 'Family'); - $this->assertFalse(in_array($id, $tagMgr->idsForTag('Family'))); + $this->assertFalse(in_array($id, $tagMgr->getIdsForTag('Family'))); } - $this->assertEquals(1, count($tagMgr->tags())); - $this->assertEquals(0, count($tagMgr->idsForTag('Family'))); + $this->assertEquals(1, count($tagMgr->getTags())); + $this->assertEquals(0, count($tagMgr->getIdsForTag('Family'))); + } + + public function testFavorite() { + $tagMgr = new OC\Tags($this->user); + $tagMgr->loadTagsFor($this->objectType); + $this->assertTrue($tagMgr->addToFavorites(1)); + $this->assertTrue($tagMgr->removeFromFavorites(1)); } } -- cgit v1.2.3 From 8a02afd87ae1e9a8d223f20ca2df35145a16ce74 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 13:27:43 +0200 Subject: Added more error checking in add() --- lib/tags.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 2eaa603c1a3..e2e1a83dd94 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -233,17 +233,25 @@ class Tags implements \OCP\ITags { return false; } try { - \OCP\DB::insertIfNotExist(self::TAG_TABLE, + $result = \OCP\DB::insertIfNotExist( + self::TAG_TABLE, array( 'uid' => $this->user, 'type' => $this->type, 'category' => $name, - )); - } catch(\Exception $e) { - \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - \OCP\Util::ERROR); + ) + ); + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; + } elseif((int)$result === 0) { + \OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG); } + } catch(\Exception $e) { + \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), + \OCP\Util::ERROR); + return false; + } $id = \OCP\DB::insertid(self::TAG_TABLE); \OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG); $this->tags[$id] = $name; -- cgit v1.2.3 From be402fab53bb4eb3ce027ef9d6edb089e356a820 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 13:29:21 +0200 Subject: Forgot to return false if add() didn't add anything. --- lib/tags.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index e2e1a83dd94..955eb3cd363 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -246,6 +246,7 @@ class Tags implements \OCP\ITags { return false; } elseif((int)$result === 0) { \OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG); + return false; } } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), -- cgit v1.2.3 From 60bff6c5896c22b31ee7864fa48026a1de5ce3fb Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 23 Sep 2013 15:52:06 +0200 Subject: Use fetchOne() instead of numRows() when doing a COUNT(*). --- lib/tags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tags.php b/lib/tags.php index 955eb3cd363..ff9f35ebc9e 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -119,7 +119,7 @@ class Tags implements \OCP\ITags { \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); return false; } - return ((int)$result->numRows() === 0); + return ((int)$result->fetchOne() === 0); } catch(\Exception $e) { \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR); -- cgit v1.2.3 From 4d3e7fa78a3c4692a7dc8587dd6e126866fc9870 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 12:34:10 +0200 Subject: Add getUserFolder/getAppFolder to Server. --- lib/public/iservercontainer.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 4478a4e8a6c..dcf8c162e6f 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -86,6 +86,20 @@ interface IServerContainer { */ function getCache(); + /** + * Returns a view to ownCloud's files folder + * + * @return \OCP\Files\Folder + */ + function getUserFolder(); + + /** + * Returns an app-specific view in ownClouds data directory + * + * @return \OCP\Files\Folder + */ + function getAppFolder(); + /** * Returns the current session * -- cgit v1.2.3 From f2de5a34eff78add366b7a89c93a8128a097996f Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 18 Sep 2013 14:25:12 +0200 Subject: Don't try to be clever --- lib/server.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 804af6b0eac..dcfd0a2db99 100644 --- a/lib/server.php +++ b/lib/server.php @@ -148,6 +148,42 @@ class Server extends SimpleContainer implements IServerContainer { return $this->query('RootFolder'); } + /** + * Returns a view to ownCloud's files folder + * + * @return \OCP\Files\Folder + */ + function getUserFolder() { + + $dir = '/files'; + $root = $this->getRootFolder(); + $folder = null; + if(!$root->nodeExists($dir)) { + $folder = $root->newFolder($dir); + } else { + $folder = $root->get($dir); + } + return $folder; + } + + /** + * Returns an app-specific view in ownClouds data directory + * + * @return \OCP\Files\Folder + */ + function getAppFolder() { + + $dir = '/' . \OC_App::getCurrentApp(); + $root = $this->getRootFolder(); + $folder = null; + if(!$root->nodeExists($dir)) { + $folder = $root->newFolder($dir); + } else { + $folder = $root->get($dir); + } + return $folder; + } + /** * @return \OC\User\Manager */ -- cgit v1.2.3 From 8c469394e61b0f13c4e111a7804e27273cf62458 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 24 Sep 2013 00:12:23 +0200 Subject: Remove duplicate method definitions --- lib/public/iservercontainer.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index d3ee5d15dcc..6d291321957 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -75,6 +75,7 @@ interface IServerContainer { * @return \OCP\Files\Folder */ function getAppFolder(); + /** * Returns the user session * @@ -99,20 +100,6 @@ interface IServerContainer { */ function getCache(); - /** - * Returns a view to ownCloud's files folder - * - * @return \OCP\Files\Folder - */ - function getUserFolder(); - - /** - * Returns an app-specific view in ownClouds data directory - * - * @return \OCP\Files\Folder - */ - function getAppFolder(); - /** * Returns the current session * -- cgit v1.2.3 From 235517f111a6d570e43cff1cd3701553412fc1a3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 19 Sep 2013 21:37:52 +0200 Subject: clear permissions cache when scanning a file --- lib/files/cache/scanner.php | 15 ++++++++++++--- tests/lib/files/cache/permissions.php | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index a986c1ca725..af819c47c61 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -36,6 +36,11 @@ class Scanner extends BasicEmitter { */ private $cache; + /** + * @var \OC\Files\Cache\Permissions $permissionsCache + */ + private $permissionsCache; + const SCAN_RECURSIVE = true; const SCAN_SHALLOW = false; @@ -46,6 +51,7 @@ class Scanner extends BasicEmitter { $this->storage = $storage; $this->storageId = $this->storage->getId(); $this->cache = $storage->getCache(); + $this->permissionsCache = $storage->getPermissionsCache(); } /** @@ -96,7 +102,11 @@ class Scanner extends BasicEmitter { } } $newData = $data; - if ($reuseExisting and $cacheData = $this->cache->get($file)) { + $cacheData = $this->cache->get($file); + if ($cacheData) { + $this->permissionsCache->remove($cacheData['fileid']); + } + if ($reuseExisting and $cacheData) { // prevent empty etag $etag = $cacheData['etag']; $propagateETagChange = false; @@ -104,7 +114,6 @@ class Scanner extends BasicEmitter { $etag = $data['etag']; $propagateETagChange = true; } - // only reuse data if the file hasn't explicitly changed if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { @@ -182,7 +191,7 @@ class Scanner extends BasicEmitter { $newChildren = array(); if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) { \OC_DB::beginTransaction(); - if(is_resource($dh)) { + if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { $child = ($path) ? $path . '/' . $file : $file; if (!Filesystem::isIgnoredDir($file)) { diff --git a/tests/lib/files/cache/permissions.php b/tests/lib/files/cache/permissions.php index 7e6e11e2eb2..4b284c2c8e2 100644 --- a/tests/lib/files/cache/permissions.php +++ b/tests/lib/files/cache/permissions.php @@ -8,6 +8,8 @@ namespace Test\Files\Cache; +use OC\Files\Storage\Temporary; + class Permissions extends \PHPUnit_Framework_TestCase { /*** * @var \OC\Files\Cache\Permissions $permissionsCache @@ -55,4 +57,19 @@ class Permissions extends \PHPUnit_Framework_TestCase { $this->permissionsCache->removeMultiple($ids, $user); } + + public function testUpdatePermissionsOnRescan() { + $storage = new Temporary(array()); + $scanner = $storage->getScanner(); + $cache = $storage->getCache(); + $permissionsCache = $storage->getPermissionsCache(); + + $storage->file_put_contents('foo.txt', 'bar'); + $scanner->scan(''); + $id = $cache->getId('foo.txt'); + $permissionsCache->set($id, 'test', 1); + + $scanner->scan(''); + $this->assertEquals(-1, $permissionsCache->get($id, 'test')); + } } -- cgit v1.2.3 From 21299745846eaa87988dcc5acd6f5604b363b03e Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 24 Sep 2013 00:59:23 +0200 Subject: Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). --- lib/files/cache/scanner.php | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index af819c47c61..96f84609cf2 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -105,39 +105,39 @@ class Scanner extends BasicEmitter { $cacheData = $this->cache->get($file); if ($cacheData) { $this->permissionsCache->remove($cacheData['fileid']); - } - if ($reuseExisting and $cacheData) { - // prevent empty etag - $etag = $cacheData['etag']; - $propagateETagChange = false; - if (empty($etag)) { - $etag = $data['etag']; - $propagateETagChange = true; - } - // only reuse data if the file hasn't explicitly changed - if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { - if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { - $data['size'] = $cacheData['size']; + if ($reuseExisting) { + // prevent empty etag + $etag = $cacheData['etag']; + $propagateETagChange = false; + if (empty($etag)) { + $etag = $data['etag']; + $propagateETagChange = true; } - if ($reuseExisting & self::REUSE_ETAG) { - $data['etag'] = $etag; - if ($propagateETagChange) { - $parent = $file; - while ($parent !== '') { - $parent = dirname($parent); - if ($parent === '.') { - $parent = ''; + // only reuse data if the file hasn't explicitly changed + if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { + if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { + $data['size'] = $cacheData['size']; + } + if ($reuseExisting & self::REUSE_ETAG) { + $data['etag'] = $etag; + if ($propagateETagChange) { + $parent = $file; + while ($parent !== '') { + $parent = dirname($parent); + if ($parent === '.') { + $parent = ''; + } + $parentCacheData = $this->cache->get($parent); + $this->cache->update($parentCacheData['fileid'], array( + 'etag' => $this->storage->getETag($parent), + )); } - $parentCacheData = $this->cache->get($parent); - $this->cache->update($parentCacheData['fileid'], array( - 'etag' => $this->storage->getETag($parent), - )); } } } + // Only update metadata that has changed + $newData = array_diff($data, $cacheData); } - // Only update metadata that has changed - $newData = array_diff($data, $cacheData); } if (!empty($newData)) { $this->cache->put($file, $newData); -- cgit v1.2.3 From cd2421c7ee04e6d46481a1d0ae36387757b204fe Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 24 Sep 2013 10:37:58 +0200 Subject: adding PHPDoc comments to getBackend ensure getChildren() is called on an instance of Share_Backend_Collection --- apps/files_sharing/lib/cache.php | 15 ++++++++++----- lib/public/share.php | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 51e8713b97a..123268e240a 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -20,6 +20,7 @@ */ namespace OC\Files\Cache; +use OCP\Share_Backend_Collection; /** * Metadata cache for shared files @@ -320,13 +321,17 @@ class Shared_Cache extends Cache { public function getAll() { $ids = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL); $folderBackend = \OCP\Share::getBackend('folder'); - foreach ($ids as $file) { - $children = $folderBackend->getChildren($file); - foreach ($children as $child) { - $ids[] = (int)$child['source']; + if ($folderBackend instanceof Share_Backend_Collection) { + foreach ($ids as $file) { + /** @var $folderBackend Share_Backend_Collection */ + $children = $folderBackend->getChildren($file); + foreach ($children as $child) { + $ids[] = (int)$child['source']; + } + } - } + return $ids; } diff --git a/lib/public/share.php b/lib/public/share.php index 10922965ea8..41f5ccbf40d 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -745,8 +745,8 @@ class Share { /** * @brief Get the backend class for the specified item type - * @param string Item type - * @return Sharing backend object + * @param string $itemType + * @return Share_Backend */ public static function getBackend($itemType) { if (isset(self::$backends[$itemType])) { -- cgit v1.2.3 From 31d2048eb83d60007183cec43a54d7a112d7a3b2 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 24 Sep 2013 11:00:08 +0200 Subject: add blacklist to txt preview backend --- lib/preview/txt.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/preview/txt.php b/lib/preview/txt.php index a487330691e..77e728eb364 100644 --- a/lib/preview/txt.php +++ b/lib/preview/txt.php @@ -9,11 +9,21 @@ namespace OC\Preview; class TXT extends Provider { + private static $blacklist = array( + 'text/calendar', + 'text/vcard', + ); + public function getMimeType() { return '/text\/.*/'; } public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $mimetype = $fileview->getMimeType($path); + if(in_array($mimetype, self::$blacklist)) { + return false; + } + $content = $fileview->fopen($path, 'r'); $content = stream_get_contents($content); -- cgit v1.2.3 From b693b5085c3da7a3242c1efe9251c2f579027d76 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 24 Sep 2013 13:08:55 +0200 Subject: don't remember login if the encrypion app is enabled because the user needs to log-in again in order to decrypt his private key with his password --- core/templates/login.php | 3 ++- lib/base.php | 1 + lib/util.php | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/core/templates/login.php b/core/templates/login.php index ee761f0aa52..3e736f164ec 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -32,9 +32,10 @@ t('Lost your password?')); ?> - + +
      diff --git a/lib/base.php b/lib/base.php index 395d8486a5e..b4e12bc7ebb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -760,6 +760,7 @@ class OC { || !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_username"]) || !$_COOKIE["oc_remember_login"] + || OC_App::isEnabled('files_encryption') ) { return false; } diff --git a/lib/util.php b/lib/util.php index 41f5f1d16be..ef42ff2aea9 100755 --- a/lib/util.php +++ b/lib/util.php @@ -414,10 +414,10 @@ class OC_Util { $encryptedFiles = true; } } - + return $encryptedFiles; } - + /** * @brief Check for correct file permissions of data directory * @paran string $dataDirectory @@ -467,6 +467,7 @@ class OC_Util { } $parameters['alt_login'] = OC_App::getAlternativeLogIns(); + $parameters['encryption_enabled'] = OC_App::isEnabled('files_encryption'); OC_Template::printGuestPage("", "login", $parameters); } @@ -654,16 +655,16 @@ class OC_Util { } return $value; } - + /** * @brief Public function to encode url parameters * * This function is used to encode path to file before output. * Encoding is done according to RFC 3986 with one exception: - * Character '/' is preserved as is. + * Character '/' is preserved as is. * * @param string $component part of URI to encode - * @return string + * @return string */ public static function encodePath($component) { $encoded = rawurlencode($component); @@ -810,7 +811,7 @@ class OC_Util { } } } - + /** * @brief Check if the connection to the internet is disabled on purpose * @return bool -- cgit v1.2.3 From ee1f627155cad4153f3da3160ca6040c137841d3 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 24 Sep 2013 13:26:12 +0200 Subject: adding privilege check on move and rename operations --- lib/connector/sabre/node.php | 11 +++++++++++ lib/connector/sabre/objecttree.php | 24 +++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 0bffa58af78..29b7f9e53a5 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -78,6 +78,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr */ public function setName($name) { + // rename is only allowed if the update privilege is granted + if (!\OC\Files\Filesystem::isUpdatable($this->path)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path); list(, $newName) = Sabre_DAV_URLUtil::splitPath($name); @@ -135,6 +140,12 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * Even if the modification time is set to a custom value the access time is set to now. */ public function touch($mtime) { + + // touch is only allowed if the update privilege is granted + if (!\OC\Files\Filesystem::isUpdatable($this->path)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + \OC\Files\Filesystem::touch($this->path, $mtime); } diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php index acff45ed5e2..7accf98c8e1 100644 --- a/lib/connector/sabre/objecttree.php +++ b/lib/connector/sabre/objecttree.php @@ -64,7 +64,29 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { list($sourceDir,) = \Sabre_DAV_URLUtil::splitPath($sourcePath); list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath); - Filesystem::rename($sourcePath, $destinationPath); + // check update privileges + if ($sourceDir === $destinationDir) { + // for renaming it's enough to check if the sourcePath can be updated + if (!\OC\Files\Filesystem::isUpdatable($sourcePath)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + } else { + // for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir + if (!\OC\Files\Filesystem::isUpdatable($sourcePath)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + if (!\OC\Files\Filesystem::isUpdatable($sourceDir)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + if (!\OC\Files\Filesystem::isUpdatable($destinationDir)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + } + + $renameOkay = Filesystem::rename($sourcePath, $destinationPath); + if (!$renameOkay) { + throw new \Sabre_DAV_Exception_Forbidden(''); + } $this->markDirty($sourceDir); $this->markDirty($destinationDir); -- cgit v1.2.3 From d101ff42f16ef7288b40666eba20c69621481ea4 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 16 Sep 2013 14:15:35 +0200 Subject: User: move checkPassword from User to Manager to not break API --- lib/public/user.php | 2 +- lib/user.php | 14 +++++--------- lib/user/http.php | 6 +++++- lib/user/manager.php | 17 +++++++++++++++++ lib/user/session.php | 19 ++++++++++--------- lib/user/user.php | 18 ------------------ tests/lib/user/session.php | 32 ++++++++++---------------------- 7 files changed, 48 insertions(+), 60 deletions(-) (limited to 'lib') diff --git a/lib/public/user.php b/lib/public/user.php index 23ff991642d..576a64d7048 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -102,7 +102,7 @@ class User { * @brief Check if the password is correct * @param $uid The username * @param $password The password - * @returns true/false + * @returns mixed username on success, false otherwise * * Check if the password is correct without logging in the user */ diff --git a/lib/user.php b/lib/user.php index 0f6f40aec9a..8868428ce24 100644 --- a/lib/user.php +++ b/lib/user.php @@ -416,16 +416,12 @@ class OC_User { * returns the user id or false */ public static function checkPassword($uid, $password) { - $user = self::getManager()->get($uid); - if ($user) { - if ($user->checkPassword($password)) { - return $user->getUID(); - } else { - return false; - } - } else { - return false; + $manager = self::getManager(); + $username = $manager->checkPassword($uid, $password); + if ($username !== false) { + return $manger->get($username); } + return false; } /** diff --git a/lib/user/http.php b/lib/user/http.php index 1e044ed4188..ea14cb57c93 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -79,7 +79,11 @@ class OC_User_HTTP extends OC_User_Backend { curl_close($ch); - return $status==200; + if($status == 200) { + return $uid; + } + + return false; } /** diff --git a/lib/user/manager.php b/lib/user/manager.php index 8dc9bfe2729..2de694a3d9f 100644 --- a/lib/user/manager.php +++ b/lib/user/manager.php @@ -118,6 +118,23 @@ class Manager extends PublicEmitter { return ($user !== null); } + /** + * Check if the password is valid for the user + * + * @param $loginname + * @param $password + * @return mixed the User object on success, false otherwise + */ + public function checkPassword($loginname, $password) { + foreach ($this->backends as $backend) { + $uid = $backend->checkPassword($loginname, $password); + if ($uid !== false) { + return $this->getUserObject($uid, $backend); + } + } + return null; + } + /** * search by user id * diff --git a/lib/user/session.php b/lib/user/session.php index 9a6c669e935..b5e9385234d 100644 --- a/lib/user/session.php +++ b/lib/user/session.php @@ -121,15 +121,16 @@ class Session implements Emitter { */ public function login($uid, $password) { $this->manager->emit('\OC\User', 'preLogin', array($uid, $password)); - $user = $this->manager->get($uid); - if ($user) { - $result = $user->checkPassword($password); - if ($result and $user->isEnabled()) { - $this->setUser($user); - $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); - return true; - } else { - return false; + $user = $this->manager->checkPassword($uid, $password); + if($user !== false) { + if (!is_null($user)) { + if ($user->isEnabled()) { + $this->setUser($user); + $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); + return true; + } else { + return false; + } } } else { return false; diff --git a/lib/user/user.php b/lib/user/user.php index 8115c43198c..e5f842944f1 100644 --- a/lib/user/user.php +++ b/lib/user/user.php @@ -105,24 +105,6 @@ class User { return !($result === false); } - /** - * Check if the password is valid for the user - * - * @param $password - * @return bool - */ - public function checkPassword($password) { - if ($this->backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) { - $result = $this->backend->checkPassword($this->uid, $password); - if ($result !== false) { - $this->uid = $result; - } - return !($result === false); - } else { - return false; - } - } - /** * Set the password of the user * diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php index 274e9e2831e..e457a7bda30 100644 --- a/tests/lib/user/session.php +++ b/tests/lib/user/session.php @@ -61,10 +61,6 @@ class Session extends \PHPUnit_Framework_TestCase { $backend = $this->getMock('OC_User_Dummy'); $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); - $user->expects($this->once()) - ->method('checkPassword') - ->with('bar') - ->will($this->returnValue(true)); $user->expects($this->once()) ->method('isEnabled') ->will($this->returnValue(true)); @@ -73,8 +69,8 @@ class Session extends \PHPUnit_Framework_TestCase { ->will($this->returnValue('foo')); $manager->expects($this->once()) - ->method('get') - ->with('foo') + ->method('checkPassword') + ->with('foo', 'bar') ->will($this->returnValue($user)); $userSession = new \OC\User\Session($manager, $session); @@ -92,17 +88,13 @@ class Session extends \PHPUnit_Framework_TestCase { $backend = $this->getMock('OC_User_Dummy'); $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); - $user->expects($this->once()) - ->method('checkPassword') - ->with('bar') - ->will($this->returnValue(true)); $user->expects($this->once()) ->method('isEnabled') ->will($this->returnValue(false)); $manager->expects($this->once()) - ->method('get') - ->with('foo') + ->method('checkPassword') + ->with('foo', 'bar') ->will($this->returnValue($user)); $userSession = new \OC\User\Session($manager, $session); @@ -119,17 +111,13 @@ class Session extends \PHPUnit_Framework_TestCase { $backend = $this->getMock('OC_User_Dummy'); $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); - $user->expects($this->once()) - ->method('checkPassword') - ->with('bar') - ->will($this->returnValue(false)); $user->expects($this->never()) ->method('isEnabled'); $manager->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($user)); + ->method('checkPassword') + ->with('foo', 'bar') + ->will($this->returnValue(false)); $userSession = new \OC\User\Session($manager, $session); $userSession->login('foo', 'bar'); @@ -145,9 +133,9 @@ class Session extends \PHPUnit_Framework_TestCase { $backend = $this->getMock('OC_User_Dummy'); $manager->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue(null)); + ->method('checkPassword') + ->with('foo', 'bar') + ->will($this->returnValue(false)); $userSession = new \OC\User\Session($manager, $session); $userSession->login('foo', 'bar'); -- cgit v1.2.3 From fe88a62d6e9ee4bb138ac4fb0fe81d8fbe082e09 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 24 Sep 2013 13:51:33 +0200 Subject: === not == --- lib/user/http.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/user/http.php b/lib/user/http.php index ea14cb57c93..e99afe59ba7 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -79,7 +79,7 @@ class OC_User_HTTP extends OC_User_Backend { curl_close($ch); - if($status == 200) { + if($status === 200) { return $uid; } -- cgit v1.2.3 From 6c5466a540340a22e487d71a2605dcda3498a658 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 24 Sep 2013 13:53:32 +0200 Subject: adding file_exists check just to be on the save side --- lib/connector/sabre/directory.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 9e0fe5e64e7..a50098df793 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -89,7 +89,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa // rename to correct path $renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath); - if (!$renameOkay) { + $fileExists = \OC\Files\Filesystem::file_exists($newPath); + if ($renameOkay === false || $fileExists === false) { \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); \OC\Files\Filesystem::unlink($partpath); throw new Sabre_DAV_Exception(); -- cgit v1.2.3 From e9eb34f1872a0237b7474496e8c759a4a3ef1156 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 24 Sep 2013 13:54:18 +0200 Subject: duplicate code :sigh: - will fix this in a second pr --- lib/connector/sabre/file.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index 61bdcd5e0ae..433b1148552 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -74,7 +74,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D } // rename to correct path - \OC\Files\Filesystem::rename($partpath, $this->path); + $renameOkay = \OC\Files\Filesystem::rename($partpath, $this->path); + $fileExists = \OC\Files\Filesystem::file_exists($this->path); + if ($renameOkay === false || $fileExists === false) { + \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); + \OC\Files\Filesystem::unlink($partpath); + throw new Sabre_DAV_Exception(); + } + //allow sync clients to send the mtime along in a header $mtime = OC_Request::hasModificationTime(); -- cgit v1.2.3 From 0a7ee7c3f7b6825815a5aae1e41725481dbbfb08 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 24 Sep 2013 14:11:47 +0200 Subject: Fix return value from User object to User ID --- lib/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/user.php b/lib/user.php index 8868428ce24..ba6036bad96 100644 --- a/lib/user.php +++ b/lib/user.php @@ -419,7 +419,7 @@ class OC_User { $manager = self::getManager(); $username = $manager->checkPassword($uid, $password); if ($username !== false) { - return $manger->get($username); + return $manager->get($username)->getUID(); } return false; } -- cgit v1.2.3 From 63324e23472071f34746e2f6132a6246babe7e74 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 24 Sep 2013 14:12:44 +0200 Subject: Fix doc --- lib/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/user.php b/lib/user.php index ba6036bad96..da774ff86f0 100644 --- a/lib/user.php +++ b/lib/user.php @@ -410,7 +410,7 @@ class OC_User { * @brief Check if the password is correct * @param string $uid The username * @param string $password The password - * @return bool + * @return mixed user id a string on success, false otherwise * * Check if the password is correct without logging in the user * returns the user id or false -- cgit v1.2.3 From 14a160e176135cb86191eed46b4cc3b3b0e58f44 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 24 Sep 2013 17:10:01 +0200 Subject: Adjust Tests and satisfy them --- lib/user/manager.php | 10 ++++++---- tests/lib/user/manager.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ tests/lib/user/user.php | 40 ---------------------------------------- 3 files changed, 51 insertions(+), 44 deletions(-) (limited to 'lib') diff --git a/lib/user/manager.php b/lib/user/manager.php index 2de694a3d9f..13286bc28a4 100644 --- a/lib/user/manager.php +++ b/lib/user/manager.php @@ -127,12 +127,14 @@ class Manager extends PublicEmitter { */ public function checkPassword($loginname, $password) { foreach ($this->backends as $backend) { - $uid = $backend->checkPassword($loginname, $password); - if ($uid !== false) { - return $this->getUserObject($uid, $backend); + if($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) { + $uid = $backend->checkPassword($loginname, $password); + if ($uid !== false) { + return $this->getUserObject($uid, $backend); + } } } - return null; + return false; } /** diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php index bc49f6db4b2..00901dd4115 100644 --- a/tests/lib/user/manager.php +++ b/tests/lib/user/manager.php @@ -98,6 +98,51 @@ class Manager extends \PHPUnit_Framework_TestCase { $this->assertTrue($manager->userExists('foo')); } + public function testCheckPassword() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('checkPassword') + ->with($this->equalTo('foo'), $this->equalTo('bar')) + ->will($this->returnValue(true)); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) { + return true; + } else { + return false; + } + })); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $user = $manager->checkPassword('foo', 'bar'); + $this->assertTrue($user instanceof \OC\User\User); + } + + public function testCheckPasswordNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->never()) + ->method('checkPassword'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertFalse($manager->checkPassword('foo', 'bar')); + } + public function testGetOneBackendExists() { /** * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php index b0d170cbfc5..de5ccbf38c1 100644 --- a/tests/lib/user/user.php +++ b/tests/lib/user/user.php @@ -100,46 +100,6 @@ class User extends \PHPUnit_Framework_TestCase { $this->assertTrue($user->delete()); } - public function testCheckPassword() { - /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend - */ - $backend = $this->getMock('\OC_User_Dummy'); - $backend->expects($this->once()) - ->method('checkPassword') - ->with($this->equalTo('foo'), $this->equalTo('bar')) - ->will($this->returnValue(true)); - - $backend->expects($this->any()) - ->method('implementsActions') - ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) { - return true; - } else { - return false; - } - })); - - $user = new \OC\User\User('foo', $backend); - $this->assertTrue($user->checkPassword('bar')); - } - - public function testCheckPasswordNotSupported() { - /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend - */ - $backend = $this->getMock('\OC_User_Dummy'); - $backend->expects($this->never()) - ->method('checkPassword'); - - $backend->expects($this->any()) - ->method('implementsActions') - ->will($this->returnValue(false)); - - $user = new \OC\User\User('foo', $backend); - $this->assertFalse($user->checkPassword('bar')); - } - public function testGetHome() { /** * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend -- cgit v1.2.3 From aaed871cee445633cb81f0aa230ba2f65c667803 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 24 Sep 2013 17:10:01 +0200 Subject: Add factory class for the server container. --- lib/public/iservercontainer.php | 3 +- lib/public/itagmanager.php | 48 +++++++++++++++++++++ lib/public/itags.php | 9 ---- lib/server.php | 3 +- lib/tagmanager.php | 68 ++++++++++++++++++++++++++++++ lib/tags.php | 28 +++++++++---- tests/lib/tags.php | 92 +++++++++++++++++++---------------------- 7 files changed, 182 insertions(+), 69 deletions(-) create mode 100644 lib/public/itagmanager.php create mode 100644 lib/tagmanager.php (limited to 'lib') diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 0df746a28ed..f37bdb10f8f 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -58,7 +58,8 @@ interface IServerContainer { /** * Returns the tag manager which can get and set tags for different object types * - * @return \OCP\ITags + * @see \OCP\ITagManager::load() + * @return \OCP\ITagManager */ function getTagManager(); diff --git a/lib/public/itagmanager.php b/lib/public/itagmanager.php new file mode 100644 index 00000000000..07e1d12fc0f --- /dev/null +++ b/lib/public/itagmanager.php @@ -0,0 +1,48 @@ + +* +* 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 . +* +*/ + +/** + * Factory class creating instances of \OCP\ITags + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +namespace OCP; + +interface ITagManager { + + /** + * Create a new \OCP\ITags instance and load tags from db. + * + * @see \OCP\ITags + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function load($type, $defaultTags=array()); + +} \ No newline at end of file diff --git a/lib/public/itags.php b/lib/public/itags.php index 12643400548..5b1ebd189da 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -38,15 +38,6 @@ namespace OCP; interface ITags { - /** - * Load tags from db. - * - * @param string $type The type identifier e.g. 'contact' or 'event'. - * @param array $defaultTags An array of default tags to be used if none are stored. - * @return \OCP\ITags - */ - public function loadTagsFor($type, $defaultTags=array()); - /** * Check if any tags are saved for this type and user. * diff --git a/lib/server.php b/lib/server.php index f3c79aa797f..c47f0e2b461 100644 --- a/lib/server.php +++ b/lib/server.php @@ -146,7 +146,8 @@ class Server extends SimpleContainer implements IServerContainer { /** * Returns the tag manager which can get and set tags for different object types * - * @return \OCP\ITags + * @see \OCP\ITagManager::load() + * @return \OCP\ITagManager */ function getTagManager() { return $this->query('TagManager'); diff --git a/lib/tagmanager.php b/lib/tagmanager.php new file mode 100644 index 00000000000..9a371a11253 --- /dev/null +++ b/lib/tagmanager.php @@ -0,0 +1,68 @@ + +* +* 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 . +* +*/ + +/** + * Factory class creating instances of \OCP\ITags + * + * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or + * anything else that is either parsed from a vobject or that the user chooses + * to add. + * Tag names are not case-sensitive, but will be saved with the case they + * are entered in. If a user already has a tag 'family' for a type, and + * tries to add a tag named 'Family' it will be silently ignored. + */ + +namespace OC; + +class TagManager implements \OCP\ITagManager { + + /** + * User + * + * @var string + */ + private $user = null; + + /** + * Constructor. + * + * @param string $user The user whos data the object will operate on. + */ + public function __construct($user) { + + $this->user = $user; + + } + + /** + * Create a new \OCP\ITags instance and load tags from db. + * + * @see \OCP\ITags + * @param string $type The type identifier e.g. 'contact' or 'event'. + * @param array $defaultTags An array of default tags to be used if none are stored. + * @return \OCP\ITags + */ + public function load($type, $defaultTags=array()) { + return new Tags($this->user, $type, $defaultTags); + } + +} \ No newline at end of file diff --git a/lib/tags.php b/lib/tags.php index ff9f35ebc9e..9fdb35a7d6e 100644 --- a/lib/tags.php +++ b/lib/tags.php @@ -38,15 +38,30 @@ class Tags implements \OCP\ITags { /** * Tags + * + * @var array */ private $tags = array(); /** * Used for storing objectid/categoryname pairs while rescanning. + * + * @var array */ private static $relations = array(); + /** + * Type + * + * @var string + */ private $type = null; + + /** + * User + * + * @var string + */ private $user = null; const TAG_TABLE = '*PREFIX*vcategory'; @@ -59,10 +74,10 @@ class Tags implements \OCP\ITags { * * @param string $user The user whos data the object will operate on. */ - public function __construct($user) { - + public function __construct($user, $type, $defaultTags = array()) { $this->user = $user; - + $this->type = $type; + $this->loadTags($defaultTags); } /** @@ -70,10 +85,8 @@ class Tags implements \OCP\ITags { * * @param string $type The type identifier e.g. 'contact' or 'event'. * @param array $defaultTags An array of default tags to be used if none are stored. - * @return \OCP\ITags */ - public function loadTagsFor($type, $defaultTags=array()) { - $this->type = $type; + protected function loadTags($defaultTags=array()) { $this->tags = array(); $result = null; $sql = 'SELECT `id`, `category` FROM `' . self::TAG_TABLE . '` ' @@ -101,7 +114,6 @@ class Tags implements \OCP\ITags { \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true), \OCP\Util::DEBUG); - return $this; } /** @@ -345,7 +357,7 @@ class Tags implements \OCP\ITags { } } // reload tags to get the proper ids. - $this->loadTagsFor($this->type); + $this->loadTags(); // Loop through temporarily cached objectid/tagname pairs // and save relations. $tags = $this->tags; diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 75db9f50f72..97e3734cfda 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -34,6 +34,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $this->objectType = uniqid('type_'); OC_User::createUser($this->user, 'pass'); OC_User::setUserId($this->user); + $this->tagMgr = new OC\TagManager($this->user); } @@ -45,102 +46,95 @@ class Test_Tags extends PHPUnit_Framework_TestCase { public function testInstantiateWithDefaults() { $defaultTags = array('Friends', 'Family', 'Work', 'Other'); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType, $defaultTags); + $tagger = $this->tagMgr->load($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->getTags())); + $this->assertEquals(4, count($tagger->getTags())); } public function testAddTags() { $tags = array('Friends', 'Family', 'Work', 'Other'); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); + $tagger = $this->tagMgr->load($this->objectType); foreach($tags as $tag) { - $result = $tagMgr->add($tag); + $result = $tagger->add($tag); $this->assertGreaterThan(0, $result, 'add() returned an ID <= 0'); $this->assertTrue((bool)$result); } - $this->assertFalse($tagMgr->add('Family')); - $this->assertFalse($tagMgr->add('fAMILY')); + $this->assertFalse($tagger->add('Family')); + $this->assertFalse($tagger->add('fAMILY')); - $this->assertCount(4, $tagMgr->getTags(), 'Wrong number of added tags'); + $this->assertCount(4, $tagger->getTags(), 'Wrong number of added tags'); } public function testAddMultiple() { $tags = array('Friends', 'Family', 'Work', 'Other'); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); + $tagger = $this->tagMgr->load($this->objectType); foreach($tags as $tag) { - $this->assertFalse($tagMgr->hasTag($tag)); + $this->assertFalse($tagger->hasTag($tag)); } - $result = $tagMgr->addMultiple($tags); + $result = $tagger->addMultiple($tags); $this->assertTrue((bool)$result); foreach($tags as $tag) { - $this->assertTrue($tagMgr->hasTag($tag)); + $this->assertTrue($tagger->hasTag($tag)); } - $this->assertCount(4, $tagMgr->getTags(), 'Not all tags added'); + $this->assertCount(4, $tagger->getTags(), 'Not all tags added'); } public function testIsEmpty() { - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); + $tagger = $this->tagMgr->load($this->objectType); - $this->assertEquals(0, count($tagMgr->getTags())); - $this->assertTrue($tagMgr->isEmpty()); + $this->assertEquals(0, count($tagger->getTags())); + $this->assertTrue($tagger->isEmpty()); - $result = $tagMgr->add('Tag'); + $result = $tagger->add('Tag'); $this->assertGreaterThan(0, $result, 'add() returned an ID <= 0'); $this->assertNotEquals(false, $result, 'add() returned false'); - $this->assertFalse($tagMgr->isEmpty()); + $this->assertFalse($tagger->isEmpty()); } public function testdeleteTags() { $defaultTags = array('Friends', 'Family', 'Work', 'Other'); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType, $defaultTags); + $tagger = $this->tagMgr->load($this->objectType, $defaultTags); - $this->assertEquals(4, count($tagMgr->getTags())); + $this->assertEquals(4, count($tagger->getTags())); - $tagMgr->delete('family'); - $this->assertEquals(3, count($tagMgr->getTags())); + $tagger->delete('family'); + $this->assertEquals(3, count($tagger->getTags())); - $tagMgr->delete(array('Friends', 'Work', 'Other')); - $this->assertEquals(0, count($tagMgr->getTags())); + $tagger->delete(array('Friends', 'Work', 'Other')); + $this->assertEquals(0, count($tagger->getTags())); } public function testRenameTag() { $defaultTags = array('Friends', 'Family', 'Wrok', 'Other'); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType, $defaultTags); + $tagger = $this->tagMgr->load($this->objectType, $defaultTags); - $this->assertTrue($tagMgr->rename('Wrok', 'Work')); - $this->assertTrue($tagMgr->hasTag('Work')); - $this->assertFalse($tagMgr->hastag('Wrok')); - $this->assertFalse($tagMgr->rename('Wrok', 'Work')); + $this->assertTrue($tagger->rename('Wrok', 'Work')); + $this->assertTrue($tagger->hasTag('Work')); + $this->assertFalse($tagger->hastag('Wrok')); + $this->assertFalse($tagger->rename('Wrok', 'Work')); } public function testTagAs() { $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); + $tagger = $this->tagMgr->load($this->objectType); foreach($objids as $id) { - $tagMgr->tagAs($id, 'Family'); + $tagger->tagAs($id, 'Family'); } - $this->assertEquals(1, count($tagMgr->getTags())); - $this->assertEquals(9, count($tagMgr->getIdsForTag('Family'))); + $this->assertEquals(1, count($tagger->getTags())); + $this->assertEquals(9, count($tagger->getIdsForTag('Family'))); } /** @@ -151,24 +145,22 @@ class Test_Tags extends PHPUnit_Framework_TestCase { // Is this "legal"? $this->testTagAs(); - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); + $tagger = $this->tagMgr->load($this->objectType); foreach($objIds as $id) { - $this->assertTrue(in_array($id, $tagMgr->getIdsForTag('Family'))); - $tagMgr->unTag($id, 'Family'); - $this->assertFalse(in_array($id, $tagMgr->getIdsForTag('Family'))); + $this->assertTrue(in_array($id, $tagger->getIdsForTag('Family'))); + $tagger->unTag($id, 'Family'); + $this->assertFalse(in_array($id, $tagger->getIdsForTag('Family'))); } - $this->assertEquals(1, count($tagMgr->getTags())); - $this->assertEquals(0, count($tagMgr->getIdsForTag('Family'))); + $this->assertEquals(1, count($tagger->getTags())); + $this->assertEquals(0, count($tagger->getIdsForTag('Family'))); } public function testFavorite() { - $tagMgr = new OC\Tags($this->user); - $tagMgr->loadTagsFor($this->objectType); - $this->assertTrue($tagMgr->addToFavorites(1)); - $this->assertTrue($tagMgr->removeFromFavorites(1)); + $tagger = $this->tagMgr->load($this->objectType); + $this->assertTrue($tagger->addToFavorites(1)); + $this->assertTrue($tagger->removeFromFavorites(1)); } } -- cgit v1.2.3 From c486fc76089ebc0f421a983e0ef62286e36e533c Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 24 Sep 2013 18:01:34 +0200 Subject: introduce OC_Util::rememberLoginAllowed() --- core/templates/login.php | 2 +- lib/base.php | 2 +- lib/util.php | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/core/templates/login.php b/core/templates/login.php index 3e736f164ec..06f64d41e39 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -32,7 +32,7 @@ t('Lost your password?')); ?> - + diff --git a/lib/base.php b/lib/base.php index b4e12bc7ebb..d0aed230dd0 100644 --- a/lib/base.php +++ b/lib/base.php @@ -760,7 +760,7 @@ class OC { || !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_username"]) || !$_COOKIE["oc_remember_login"] - || OC_App::isEnabled('files_encryption') + || !OC_Util::rememberLoginAllowed() ) { return false; } diff --git a/lib/util.php b/lib/util.php index ef42ff2aea9..e12f753d5ae 100755 --- a/lib/util.php +++ b/lib/util.php @@ -467,7 +467,7 @@ class OC_Util { } $parameters['alt_login'] = OC_App::getAlternativeLogIns(); - $parameters['encryption_enabled'] = OC_App::isEnabled('files_encryption'); + $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed(); OC_Template::printGuestPage("", "login", $parameters); } @@ -509,6 +509,17 @@ class OC_Util { } } + /** + * Check if it is allowed to remember login. + * E.g. if encryption is enabled the user needs to log-in every time he visites + * ownCloud in order to decrypt the private key. + * + * @return bool + */ + public static function rememberLoginAllowed() { + return !OC_App::isEnabled('files_encryption'); + } + /** * @brief Check if the user is a subadmin, redirects to home if not * @return array $groups where the current user is subadmin -- cgit v1.2.3 From 2d12e52769a30ba37d5760b1194f613bcc71035b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 24 Sep 2013 12:59:48 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/ca.php | 5 ++++ apps/files/l10n/en_GB.php | 7 ++++- apps/files/l10n/fr.php | 5 ++++ apps/files/l10n/gl.php | 5 ++++ apps/files/l10n/nn_NO.php | 5 ++++ core/l10n/en_GB.php | 9 ++++++- core/l10n/fr.php | 6 ++++- core/l10n/gl.php | 9 ++++++- core/l10n/nn_NO.php | 16 +++++++++++- l10n/ca/files.po | 18 ++++++------- l10n/da/settings.po | 34 ++++++++++++------------ l10n/en_GB/core.po | 38 +++++++++++++-------------- l10n/en_GB/files.po | 20 +++++++------- l10n/fr/core.po | 32 +++++++++++------------ l10n/fr/files.po | 18 ++++++------- l10n/gl/core.po | 38 +++++++++++++-------------- l10n/gl/files.po | 18 ++++++------- l10n/nn_NO/core.po | 52 ++++++++++++++++++------------------- l10n/nn_NO/files.po | 19 +++++++------- l10n/nn_NO/lib.po | 14 +++++----- l10n/nn_NO/settings.po | 52 ++++++++++++++++++------------------- l10n/templates/core.pot | 16 ++++++------ 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_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 20 +++++++------- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/nn_NO.php | 2 ++ settings/l10n/da.php | 5 ++++ settings/l10n/nn_NO.php | 14 ++++++++++ 35 files changed, 287 insertions(+), 208 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 8fd72ac0a68..5c2cade8d63 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un fitxer temporal", "Failed to write to disk" => "Ha fallat en escriure al disc", "Not enough storage available" => "No hi ha prou espai disponible", +"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.", +"Upload failed. Could not find uploaded file" => "La pujada ha fallat. El fitxer pujat no s'ha trobat.", "Invalid directory." => "Directori no vàlid.", "Files" => "Fitxers", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "No es pot pujar {filename} perquè és una carpeta o té 0 bytes", "Not enough space available" => "No hi ha prou espai disponible", "Upload cancelled." => "La pujada s'ha cancel·lat.", +"Could not get result from server." => "No hi ha resposta del servidor.", "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", "URL cannot be empty." => "La URL no pot ser buida", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.", "Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.", +"Error moving file" => "Error en moure el fitxer", "Name" => "Nom", "Size" => "Mida", "Modified" => "Modificat", diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php index e67719efba9..c747555e40b 100644 --- a/apps/files/l10n/en_GB.php +++ b/apps/files/l10n/en_GB.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Missing a temporary folder", "Failed to write to disk" => "Failed to write to disk", "Not enough storage available" => "Not enough storage available", +"Upload failed. Could not get file info." => "Upload failed. Could not get file info.", +"Upload failed. Could not find uploaded file" => "Upload failed. Could not find uploaded file", "Invalid directory." => "Invalid directory.", "Files" => "Files", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes", "Not enough space available" => "Not enough space available", "Upload cancelled." => "Upload cancelled.", +"Could not get result from server." => "Could not get result from server.", "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.", "URL cannot be empty." => "URL cannot be empty.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud", @@ -37,11 +41,12 @@ $TRANSLATIONS = array( "_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"), "'.' is an invalid file name." => "'.' is an invalid file name.", "File name cannot be empty." => "File name cannot be empty.", -"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.", "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!", "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.", "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.", +"Error moving file" => "Error moving file", "Name" => "Name", "Size" => "Size", "Modified" => "Modified", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index d6470458083..03505a2a269 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Absence de dossier temporaire.", "Failed to write to disk" => "Erreur d'écriture sur le disque", "Not enough storage available" => "Plus assez d'espace de stockage disponible", +"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.", +"Upload failed. Could not find uploaded file" => "L'envoi a échoué. Impossible de trouver le fichier envoyé.", "Invalid directory." => "Dossier invalide.", "Files" => "Fichiers", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Not enough space available" => "Espace disponible insuffisant", "Upload cancelled." => "Envoi annulé.", +"Could not get result from server." => "Ne peut recevoir les résultats du serveur.", "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "URL cannot be empty." => "L'URL ne peut-être vide", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.", "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.", +"Error moving file" => "Erreur lors du déplacement du fichier", "Name" => "Nom", "Size" => "Taille", "Modified" => "Modifié", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 0eba94f7d60..2766478650a 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta o cartafol temporal", "Failed to write to disk" => "Produciuse un erro ao escribir no disco", "Not enough storage available" => "Non hai espazo de almacenamento abondo", +"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.", +"Upload failed. Could not find uploaded file" => "O envío fracasou. Non foi posíbel atopar o ficheiro enviado", "Invalid directory." => "O directorio é incorrecto.", "Files" => "Ficheiros", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes", "Not enough space available" => "O espazo dispoñíbel é insuficiente", "Upload cancelled." => "Envío cancelado.", +"Could not get result from server." => "Non foi posíbel obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", "URL cannot be empty." => "O URL non pode quedar baleiro.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.", "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.", +"Error moving file" => "Produciuse un erro ao mover o ficheiro", "Name" => "Nome", "Size" => "Tamaño", "Modified" => "Modificado", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 04c47c31fbb..e29b1d3ad36 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglar ei mellombels mappe", "Failed to write to disk" => "Klarte ikkje skriva til disk", "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg", +"Upload failed. Could not get file info." => "Feil ved opplasting. Klarte ikkje å henta filinfo.", +"Upload failed. Could not find uploaded file" => "Feil ved opplasting. Klarte ikkje å finna opplasta fil.", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.", "Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg", "Upload cancelled." => "Opplasting avbroten.", +"Could not get result from server." => "Klarte ikkje å henta resultat frå tenaren.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "URL cannot be empty." => "Nettadressa kan ikkje vera tom.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.", "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.", +"Error moving file" => "Feil ved flytting av fil", "Name" => "Namn", "Size" => "Storleik", "Modified" => "Endra", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index feeacd481a8..bb26f1469dd 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -58,8 +58,15 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"), +"One file conflict" => "One file conflict", +"Which files do you want to keep?" => "Which files do you wish to keep?", +"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.", "Cancel" => "Cancel", +"Continue" => "Continue", +"(all selected)" => "(all selected)", +"({count} selected)" => "({count} selected)", +"Error loading file exists template" => "Error loading file exists template", "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index d3229ddf994..29489e86b7f 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -56,8 +56,12 @@ $TRANSLATIONS = array( "No" => "Non", "Ok" => "Ok", "Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"), +"One file conflict" => "Un conflit de fichier", +"Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?", +"If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.", "Cancel" => "Annuler", +"({count} selected)" => "({count} sélectionnés)", "The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", "The app name is not specified." => "Le nom de l'application n'est pas spécifié.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 9ba5ab645aa..e3be94537e5 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -58,8 +58,15 @@ $TRANSLATIONS = array( "No" => "Non", "Ok" => "Aceptar", "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"), +"One file conflict" => "Un conflito de ficheiro", +"Which files do you want to keep?" => "Que ficheiros quere conservar?", +"If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.", "Cancel" => "Cancelar", +"Continue" => "Continuar", +"(all selected)" => "(todo o seleccionado)", +"({count} selected)" => "({count} seleccionados)", +"Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente", "The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 8ec3892a8ac..d596605dbcd 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.", "No categories selected for deletion." => "Ingen kategoriar valt for sletting.", "Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.", +"No image or file provided" => "Inga bilete eller fil gitt", +"Unknown filetype" => "Ukjend filtype", +"Invalid image" => "Ugyldig bilete", +"No temporary profile picture available, try again" => "Inga midlertidig profilbilete tilgjengeleg, prøv igjen", +"No crop data provided" => "Ingen beskjeringsdata gitt", "Sunday" => "Søndag", "Monday" => "Måndag", "Tuesday" => "Tysdag", @@ -48,11 +53,20 @@ $TRANSLATIONS = array( "last year" => "i fjor", "years ago" => "år sidan", "Choose" => "Vel", +"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}", "Yes" => "Ja", "No" => "Nei", "Ok" => "Greitt", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"), +"One file conflict" => "Éin filkonflikt", +"Which files do you want to keep?" => "Kva filer vil du spara?", +"If you select both versions, the copied file will have a number added to its name." => "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.", "Cancel" => "Avbryt", +"Continue" => "Gå vidare", +"(all selected)" => "(alle valte)", +"({count} selected)" => "({count} valte)", +"Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal", "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Error" => "Feil", "The app name is not specified." => "Programnamnet er ikkje spesifisert.", diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 173aeb30aca..82091cf75b3 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 15:10+0000\n" +"Last-Translator: rogerc\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" @@ -78,23 +78,23 @@ msgstr "No hi ha prou espai disponible" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directori no vàlid." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Fitxers" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes" #: js/file-upload.js:255 msgid "Not enough space available" @@ -106,7 +106,7 @@ msgstr "La pujada s'ha cancel·lat." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "No hi ha resposta del servidor." #: js/file-upload.js:446 msgid "" @@ -223,7 +223,7 @@ msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Error en moure el fitxer" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index accacfac32a..7251a13d4ff 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 16:59+0000\n" +"Last-Translator: Sappe\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" @@ -89,28 +89,28 @@ msgstr "Kunne ikke opdatere app'en." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Forkert kodeord" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Intet brugernavn givet" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" @@ -120,11 +120,11 @@ msgstr "" msgid "Update to {appversion}" msgstr "Opdatér til {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Deaktiver" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Aktiver" @@ -132,31 +132,31 @@ msgstr "Aktiver" msgid "Please wait...." msgstr "Vent venligst..." -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Kunne ikke deaktivere app" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Kunne ikke aktivere app" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Opdaterer...." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Der opstod en fejl under app opgraderingen" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Fejl" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Opdater" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Opdateret" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index 5ac5d34f566..f9b0f0d24fa 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-23 16:10+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -270,22 +270,22 @@ msgstr "Error loading message template: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} file conflict" +msgstr[1] "{count} file conflicts" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "One file conflict" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Which files do you wish to keep?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "If you select both versions, the copied file will have a number added to its name." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -293,19 +293,19 @@ msgstr "Cancel" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continue" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(all selected)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} selected)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Error loading file exists template" #: 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 @@ -316,7 +316,7 @@ msgstr "The object type is not specified." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Error" @@ -336,7 +336,7 @@ msgstr "Shared" msgid "Share" msgstr "Share" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Error whilst sharing" @@ -436,23 +436,23 @@ msgstr "delete" msgid "share" msgstr "share" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Password protected" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Error unsetting expiration date" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Error setting expiration date" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Sending ..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "Email sent" diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po index fe7922ffe9a..bf8e9374348 100644 --- a/l10n/en_GB/files.po +++ b/l10n/en_GB/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 16:00+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,23 +77,23 @@ msgstr "Not enough storage available" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Upload failed. Could not get file info." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Upload failed. Could not find uploaded file" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Invalid directory." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Files" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Unable to upload {filename} as it is a directory or has 0 bytes" #: js/file-upload.js:255 msgid "Not enough space available" @@ -105,7 +105,7 @@ msgstr "Upload cancelled." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Could not get result from server." #: js/file-upload.js:446 msgid "" @@ -198,7 +198,7 @@ msgstr "File name cannot be empty." msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." +msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." #: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" @@ -222,7 +222,7 @@ msgstr "Your download is being prepared. This might take some time if the files #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Error moving file" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 76dc658c71d..4c7f6be045a 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-23 19:40+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -275,22 +275,22 @@ msgstr "Erreur de chargement du modèle de message : {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} fichier en conflit" +msgstr[1] "{count} fichiers en conflit" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Un conflit de fichier" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Quels fichiers désirez-vous garder ?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -306,7 +306,7 @@ msgstr "" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} sélectionnés)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" @@ -321,7 +321,7 @@ msgstr "Le type d'objet n'est pas spécifié." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Erreur" @@ -341,7 +341,7 @@ msgstr "Partagé" msgid "Share" msgstr "Partager" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Erreur lors de la mise en partage" @@ -441,23 +441,23 @@ msgstr "supprimer" msgid "share" msgstr "partager" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Protégé par un mot de passe" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Une erreur est survenue pendant la suppression de la date d'expiration" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Erreur lors de la spécification de la date d'expiration" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "En cours d'envoi ..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "Email envoyé" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index fcbbbad254e..72963e3573f 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-23 19:30+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -80,23 +80,23 @@ msgstr "Plus assez d'espace de stockage disponible" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Dossier invalide." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Fichiers" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle" #: js/file-upload.js:255 msgid "Not enough space available" @@ -108,7 +108,7 @@ msgstr "Envoi annulé." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Ne peut recevoir les résultats du serveur." #: js/file-upload.js:446 msgid "" @@ -225,7 +225,7 @@ msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Erreur lors du déplacement du fichier" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 72986b81c8a..b8bcfd4eea8 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-23 10:30+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -270,22 +270,22 @@ msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} conflito de ficheiro" +msgstr[1] "{count} conflitos de ficheiros" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Un conflito de ficheiro" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Que ficheiros quere conservar?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -293,19 +293,19 @@ msgstr "Cancelar" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Continuar" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(todo o seleccionado)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} seleccionados)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente" #: 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 @@ -316,7 +316,7 @@ msgstr "Non se especificou o tipo de obxecto." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Erro" @@ -336,7 +336,7 @@ msgstr "Compartir" msgid "Share" msgstr "Compartir" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Produciuse un erro ao compartir" @@ -436,23 +436,23 @@ msgstr "eliminar" msgid "share" msgstr "compartir" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Protexido con contrasinal" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Produciuse un erro ao retirar a data de caducidade" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Produciuse un erro ao definir a data de caducidade" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Enviando..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "Correo enviado" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 45a9129ab2d..33e76e84873 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-23 10:30+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,23 +77,23 @@ msgstr "Non hai espazo de almacenamento abondo" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "O envío fracasou. Non foi posíbel atopar o ficheiro enviado" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "O directorio é incorrecto." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Ficheiros" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes" #: js/file-upload.js:255 msgid "Not enough space available" @@ -105,7 +105,7 @@ msgstr "Envío cancelado." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Non foi posíbel obter o resultado do servidor." #: js/file-upload.js:446 msgid "" @@ -222,7 +222,7 @@ msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Produciuse un erro ao mover o ficheiro" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 40a6de51ba5..e16776a0986 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 08:30+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,23 +95,23 @@ msgstr "Klarte ikkje fjerna %s frå favorittar." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Inga bilete eller fil gitt" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Ukjend filtype" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Ugyldig bilete" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Ingen beskjeringsdata gitt" #: js/config.php:32 msgid "Sunday" @@ -251,7 +251,7 @@ msgstr "Vel" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Klarte ikkje å lasta filplukkarmal: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -267,27 +267,27 @@ msgstr "Greitt" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Klarte ikkje å lasta meldingsmal: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{count} filkonflikt" +msgstr[1] "{count} filkonfliktar" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Éin filkonflikt" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Kva filer vil du spara?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -295,19 +295,19 @@ msgstr "Avbryt" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Gå vidare" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(alle valte)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} valte)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Klarte ikkje å lasta fil-finst-mal" #: 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 @@ -318,7 +318,7 @@ msgstr "Objekttypen er ikkje spesifisert." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Feil" @@ -338,7 +338,7 @@ msgstr "Delt" msgid "Share" msgstr "Del" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Feil ved deling" @@ -438,23 +438,23 @@ msgstr "slett" msgid "share" msgstr "del" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Passordverna" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Klarte ikkje fjerna utløpsdato" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Klarte ikkje setja utløpsdato" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Sender …" -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "E-post sendt" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 0573ecf2951..dc82bdca1b7 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -5,13 +5,14 @@ # Translators: # unhammer , 2013 # unhammer , 2013 +# unhammer , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 08:20+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,23 +79,23 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig mappe." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Filer" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte." #: js/file-upload.js:255 msgid "Not enough space available" @@ -106,7 +107,7 @@ msgstr "Opplasting avbroten." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Klarte ikkje å henta resultat frå tenaren." #: js/file-upload.js:446 msgid "" @@ -223,7 +224,7 @@ msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store." #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Feil ved flytting av fil" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po index dd499893e3c..9e73f6fe6aa 100644 --- a/l10n/nn_NO/lib.po +++ b/l10n/nn_NO/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 08:30+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" @@ -61,11 +61,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Ukjend filtype" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Ugyldig bilete" #: defaults.php:35 msgid "web services under your control" @@ -166,15 +166,15 @@ msgstr "Feil i autentisering" msgid "Token expired. Please reload page." msgstr "" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Filer" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Tekst" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 6100216bbda..761b9f46275 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"PO-Revision-Date: 2013-09-24 08:30+0000\n" +"Last-Translator: unhammer \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,42 +89,42 @@ msgstr "Klarte ikkje oppdatera programmet." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Feil passord" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Ingen brukar gitt" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt." #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Klarte ikkje å endra passordet" #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Oppdater til {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Slå av" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Slå på" @@ -132,37 +132,37 @@ msgstr "Slå på" msgid "Please wait...." msgstr "Ver venleg og vent …" -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Klarte ikkje å skru av programmet" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Klarte ikkje å skru på programmet" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Oppdaterer …" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Feil ved oppdatering av app" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Feil" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Oppdater" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Oppdatert" #: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Vel eit profilbilete" #: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." @@ -492,31 +492,31 @@ msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg" #: templates/personal.php:86 msgid "Profile picture" -msgstr "" +msgstr "Profilbilete" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Last opp ny" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Vel ny frå Filer" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Fjern bilete" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Avbryt" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Vel som profilbilete" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index e3ee79caef9..a57486f5ed2 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -316,7 +316,7 @@ msgstr "" #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "" @@ -336,7 +336,7 @@ msgstr "" msgid "Share" msgstr "" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "" @@ -436,23 +436,23 @@ msgstr "" msgid "share" msgstr "" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "" -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 6dd2e8281c0..23d0cd0b17b 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 17a33f87927..44e17a2fcb2 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:51-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 5d1b69c53a1..abdd985cfdf 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 bc0fb489f73..34ed992660b 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index c0b82eeb690..45fa700a43b 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 42221b00287..2e73cce980a 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 15b4f1c6d06..0733e0c2737 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 4602bc52d64..66c00629bd9 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:56-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -116,11 +116,11 @@ msgstr "" msgid "Update to {appversion}" msgstr "" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "" @@ -128,31 +128,31 @@ msgstr "" msgid "Please wait...." msgstr "" -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index c27848c3666..919a39b4059 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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 e23c0a1dc54..dfb732ed0c9 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-22 12:54-0400\n" +"POT-Creation-Date: 2013-09-24 12:58-0400\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/nn_NO.php b/lib/l10n/nn_NO.php index d5da8c64415..e8bf8dfdef4 100644 --- a/lib/l10n/nn_NO.php +++ b/lib/l10n/nn_NO.php @@ -5,6 +5,8 @@ $TRANSLATIONS = array( "Settings" => "Innstillingar", "Users" => "Brukarar", "Admin" => "Administrer", +"Unknown filetype" => "Ukjend filtype", +"Invalid image" => "Ugyldig bilete", "web services under your control" => "Vev tjenester under din kontroll", "Authentication error" => "Feil i autentisering", "Files" => "Filer", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 9872d3f5e07..fcff9dbcfd9 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s", "Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s", "Couldn't update app." => "Kunne ikke opdatere app'en.", +"Wrong password" => "Forkert kodeord", +"No user supplied" => "Intet brugernavn givet", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt", +"Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", "Update to {appversion}" => "Opdatér til {appversion}", "Disable" => "Deaktiver", "Enable" => "Aktiver", diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php index 822a17e7831..9eb31a887bd 100644 --- a/settings/l10n/nn_NO.php +++ b/settings/l10n/nn_NO.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s", "Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s", "Couldn't update app." => "Klarte ikkje oppdatera programmet.", +"Wrong password" => "Feil passord", +"No user supplied" => "Ingen brukar gitt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.", +"Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.", +"Unable to change password" => "Klarte ikkje å endra passordet", "Update to {appversion}" => "Oppdater til {appversion}", "Disable" => "Slå av", "Enable" => "Slå på", @@ -27,6 +33,7 @@ $TRANSLATIONS = array( "Error" => "Feil", "Update" => "Oppdater", "Updated" => "Oppdatert", +"Select a profile picture" => "Vel eit profilbilete", "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.", "Saving..." => "Lagrar …", "deleted" => "sletta", @@ -100,6 +107,13 @@ $TRANSLATIONS = array( "Email" => "E-post", "Your email address" => "Di epost-adresse", "Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg", +"Profile picture" => "Profilbilete", +"Upload new" => "Last opp ny", +"Select new from Files" => "Vel ny frå Filer", +"Remove image" => "Fjern bilete", +"Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.", +"Abort" => "Avbryt", +"Choose as profile image" => "Vel som profilbilete", "Language" => "Språk", "Help translate" => "Hjelp oss å omsetja", "WebDAV" => "WebDAV", -- cgit v1.2.3 From b2ef978d1069d5e7e172806a9e2426de2717a1f2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 10:30:48 +0200 Subject: AppFramework: - get request from the server container - implement registerMiddleWare() - adding getAppName() to app container --- .../dependencyinjection/dicontainer.php | 50 +++++++++++----------- lib/public/appframework/iappcontainer.php | 12 ++++++ 2 files changed, 37 insertions(+), 25 deletions(-) (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 2ef885d7b2c..54878266939 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -34,6 +34,8 @@ use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; use OCP\AppFramework\IApi; use OCP\AppFramework\IAppContainer; +use OCP\AppFramework\IMiddleWare; +use OCP\IServerContainer; class DIContainer extends SimpleContainer implements IAppContainer{ @@ -57,31 +59,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{ * Http */ $this['Request'] = $this->share(function($c) { - - $params = array(); - - // we json decode the body only in case of content type json - if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) { - $params = json_decode(file_get_contents('php://input'), true); - $params = is_array($params) ? $params: array(); - } - - return new Request( - array( - 'get' => $_GET, - 'post' => $_POST, - 'files' => $_FILES, - 'server' => $_SERVER, - 'env' => $_ENV, - 'session' => $_SESSION, - 'cookies' => $_COOKIE, - 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) - ? $_SERVER['REQUEST_METHOD'] - : null, - 'params' => $params, - 'urlParams' => $c['urlParams'] - ) - ); + /** @var $c SimpleContainer */ + /** @var $server IServerContainer */ + $server = $c->query('ServerContainer'); + return $server->getRequest(); }); $this['Protocol'] = $this->share(function($c){ @@ -138,4 +119,23 @@ class DIContainer extends SimpleContainer implements IAppContainer{ { return $this->query('ServerContainer'); } + + /** + * @param IMiddleWare $middleWare + * @return boolean + */ + function registerMiddleWare(IMiddleWare $middleWare) { + /** @var $dispatcher MiddlewareDispatcher */ + $dispatcher = $this->query('MiddlewareDispatcher'); + $dispatcher->registerMiddleware($middleWare); + + } + + /** + * used to return the appname of the set application + * @return string the name of your application + */ + function getAppName() { + return $this->query('AppName'); + } } diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index c8f6229dd9e..7d3b4b3bac7 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -33,6 +33,12 @@ use OCP\IContainer; */ interface IAppContainer extends IContainer{ + /** + * used to return the appname of the set application + * @return string the name of your application + */ + function getAppName(); + /** * @return IApi */ @@ -42,4 +48,10 @@ interface IAppContainer extends IContainer{ * @return \OCP\IServerContainer */ function getServer(); + + /** + * @param IMiddleWare $middleWare + * @return boolean + */ + function registerMiddleWare(IMiddleWare $middleWare); } -- cgit v1.2.3 From b168d5aa3b16501e9cb4eaa3b665939dde5de52b Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 11:05:24 +0200 Subject: class API decommissioning part 1 --- lib/appframework/core/api.php | 217 ++++----------------------------------- lib/public/appframework/iapi.php | 89 +--------------- 2 files changed, 21 insertions(+), 285 deletions(-) (limited to 'lib') diff --git a/lib/appframework/core/api.php b/lib/appframework/core/api.php index 337e3b57d6d..39522ee3dd5 100644 --- a/lib/appframework/core/api.php +++ b/lib/appframework/core/api.php @@ -46,24 +46,6 @@ class API implements IApi{ } - /** - * used to return the appname of the set application - * @return string the name of your application - */ - public function getAppName(){ - return $this->appName; - } - - - /** - * Creates a new navigation entry - * @param array $entry containing: id, name, order, icon and href key - */ - public function addNavigationEntry(array $entry){ - \OCP\App::addNavigationEntry($entry); - } - - /** * Gets the userid of the current user * @return string the user id of the current user @@ -73,14 +55,6 @@ class API implements IApi{ } - /** - * Sets the current navigation entry to the currently running app - */ - public function activateNavigationEntry(){ - \OCP\App::setActiveNavigationEntry($this->appName); - } - - /** * Adds a new javascript file * @param string $scriptName the name of the javascript in js/ without the suffix @@ -124,79 +98,6 @@ class API implements IApi{ \OCP\Util::addStyle($this->appName . '/3rdparty', $name); } - /** - * Looks up a systemwide defined value - * @param string $key the key of the value, under which it was saved - * @return string the saved value - */ - public function getSystemValue($key){ - return \OCP\Config::getSystemValue($key, ''); - } - - - /** - * Sets a new systemwide value - * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored - */ - public function setSystemValue($key, $value){ - return \OCP\Config::setSystemValue($key, $value); - } - - - /** - * Looks up an appwide defined value - * @param string $key the key of the value, under which it was saved - * @return string the saved value - */ - public function getAppValue($key, $appName=null){ - if($appName === null){ - $appName = $this->appName; - } - return \OCP\Config::getAppValue($appName, $key, ''); - } - - - /** - * Writes a new appwide value - * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored - */ - public function setAppValue($key, $value, $appName=null){ - if($appName === null){ - $appName = $this->appName; - } - return \OCP\Config::setAppValue($appName, $key, $value); - } - - - - /** - * Shortcut for setting a user defined value - * @param string $key the key under which the value is being stored - * @param string $value the value that you want to store - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one - */ - public function setUserValue($key, $value, $userId=null){ - if($userId === null){ - $userId = $this->getUserId(); - } - \OCP\Config::setUserValue($userId, $this->appName, $key, $value); - } - - - /** - * Shortcut for getting a user defined value - * @param string $key the key under which the value is being stored - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one - */ - public function getUserValue($key, $userId=null){ - if($userId === null){ - $userId = $this->getUserId(); - } - return \OCP\Config::getUserValue($userId, $this->appName, $key); - } - /** * Returns the translation object @@ -208,28 +109,6 @@ class API implements IApi{ } - /** - * Used to abstract the owncloud database access away - * @param string $sql the sql query with ? placeholder for params - * @param int $limit the maximum number of rows - * @param int $offset from which row we want to start - * @return \OCP\DB a query object - */ - public function prepareQuery($sql, $limit=null, $offset=null){ - return \OCP\DB::prepare($sql, $limit, $offset); - } - - - /** - * Used to get the id of the just inserted element - * @param string $tableName the name of the table where we inserted the item - * @return int the id of the inserted element - */ - public function getInsertId($tableName){ - return \OCP\DB::insertid($tableName); - } - - /** * Returns the URL for a route * @param string $routeName the name of the route @@ -293,37 +172,6 @@ class API implements IApi{ } - /** - * Checks if the current user is logged in - * @return bool true if logged in - */ - public function isLoggedIn(){ - return \OCP\User::isLoggedIn(); - } - - - /** - * Checks if a user is an admin - * @param string $userId the id of the user - * @return bool true if admin - */ - public function isAdminUser($userId){ - # TODO: use public api - return \OC_User::isAdminUser($userId); - } - - - /** - * Checks if a user is an subadmin - * @param string $userId the id of the user - * @return bool true if subadmin - */ - public function isSubAdminUser($userId){ - # TODO: use public api - return \OC_SubAdmin::isSubAdmin($userId); - } - - /** * Checks if the CSRF check was correct * @return bool true if CSRF check passed @@ -371,26 +219,6 @@ class API implements IApi{ } - /** - * Returns a template - * @param string $templateName the name of the template - * @param string $renderAs how it should be rendered - * @param string $appName the name of the app - * @return \OCP\Template a new template - */ - public function getTemplate($templateName, $renderAs='user', $appName=null){ - if($appName === null){ - $appName = $this->appName; - } - - if($renderAs === 'blank'){ - return new \OCP\Template($appName, $templateName); - } else { - return new \OCP\Template($appName, $templateName, $renderAs); - } - } - - /** * turns an owncloud path into a path on the filesystem * @param string path the path to the file on the oc filesystem @@ -467,6 +295,26 @@ class API implements IApi{ \OCP\Backgroundjob::addRegularTask($className, $methodName); } + /** + * Returns a template + * @param string $templateName the name of the template + * @param string $renderAs how it should be rendered + * @param string $appName the name of the app + * @return \OCP\Template a new template + */ + public function getTemplate($templateName, $renderAs='user', $appName=null){ + if($appName === null){ + $appName = $this->appName; + } + + if($renderAs === 'blank'){ + return new \OCP\Template($appName, $templateName); + } else { + return new \OCP\Template($appName, $templateName, $renderAs); + } + } + + /** * Tells ownCloud to include a template in the admin overview * @param string $mainPath the path to the main php file without the php @@ -481,23 +329,6 @@ class API implements IApi{ \OCP\App::registerAdmin($appName, $mainPath); } - /** - * Do a user login - * @param string $user the username - * @param string $password the password - * @return bool true if successful - */ - public function login($user, $password) { - return \OC_User::login($user, $password); - } - - /** - * @brief Loggs the user out including all the session data - * Logout, destroys session - */ - public function logout() { - return \OCP\User::logout(); - } /** * get the filesystem info @@ -514,12 +345,4 @@ class API implements IApi{ return \OC\Files\Filesystem::getFileInfo($path); } - /** - * get the view - * - * @return OC\Files\View instance - */ - public function getView() { - return \OC\Files\Filesystem::getView(); - } } diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php index 5374f0dcaf5..fa6af5f5965 100644 --- a/lib/public/appframework/iapi.php +++ b/lib/public/appframework/iapi.php @@ -30,19 +30,6 @@ namespace OCP\AppFramework; */ interface IApi { - /** - * used to return the appname of the set application - * @return string the name of your application - */ - function getAppName(); - - - /** - * Creates a new navigation entry - * @param array $entry containing: id, name, order, icon and href key - */ - function addNavigationEntry(array $entry); - /** * Gets the userid of the current user @@ -51,12 +38,6 @@ interface IApi { function getUserId(); - /** - * Sets the current navigation entry to the currently running app - */ - function activateNavigationEntry(); - - /** * Adds a new javascript file * @param string $scriptName the name of the javascript in js/ without the suffix @@ -86,53 +67,6 @@ interface IApi { */ function add3rdPartyStyle($name); - /** - * Looks up a system-wide defined value - * @param string $key the key of the value, under which it was saved - * @return string the saved value - */ - function getSystemValue($key); - - /** - * Sets a new system-wide value - * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored - */ - function setSystemValue($key, $value); - - - /** - * Looks up an app-specific defined value - * @param string $key the key of the value, under which it was saved - * @return string the saved value - */ - function getAppValue($key, $appName = null); - - - /** - * Writes a new app-specific value - * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored - */ - function setAppValue($key, $value, $appName = null); - - - /** - * Shortcut for setting a user defined value - * @param string $key the key under which the value is being stored - * @param string $value the value that you want to store - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one - */ - function setUserValue($key, $value, $userId = null); - - - /** - * Shortcut for getting a user defined value - * @param string $key the key under which the value is being stored - * @param string $userId the userId of the user that we want to store the value under, defaults to the current one - */ - function getUserValue($key, $userId = null); - /** * Returns the translation object * @return \OC_L10N the translation object @@ -142,28 +76,6 @@ interface IApi { function getTrans(); - /** - * Used to abstract the owncloud database access away - * @param string $sql the sql query with ? placeholder for params - * @param int $limit the maximum number of rows - * @param int $offset from which row we want to start - * @return \OCP\DB a query object - * - * FIXME: returns non public interface / object - */ - function prepareQuery($sql, $limit=null, $offset=null); - - - /** - * Used to get the id of the just inserted element - * @param string $tableName the name of the table where we inserted the item - * @return int the id of the inserted element - * - * FIXME: move to db object - */ - function getInsertId($tableName); - - /** * Returns the URL for a route * @param string $routeName the name of the route @@ -235,4 +147,5 @@ interface IApi { * @return \OCP\Template a new template */ function getTemplate($templateName, $renderAs='user', $appName=null); + } -- cgit v1.2.3 From 30286c06ab50a04424c415d1007bac66d452208d Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 11:05:59 +0200 Subject: stripos return value check --- lib/server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index fccb8fad4d0..9de9f5a0566 100644 --- a/lib/server.php +++ b/lib/server.php @@ -25,7 +25,7 @@ class Server extends SimpleContainer implements IServerContainer { $params = array(); // we json decode the body only in case of content type json - if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) { + if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') !== false ) { $params = json_decode(file_get_contents('php://input'), true); $params = is_array($params) ? $params: array(); } -- cgit v1.2.3 From 1c976a7c9bd27f1fe3f2b1834fd3cbdf5f235bc1 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 25 Sep 2013 15:03:22 +0200 Subject: manager checkPassword now returns User object, adjust internal user class accordingly. --- lib/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/user.php b/lib/user.php index da774ff86f0..b5fd418acd6 100644 --- a/lib/user.php +++ b/lib/user.php @@ -419,7 +419,7 @@ class OC_User { $manager = self::getManager(); $username = $manager->checkPassword($uid, $password); if ($username !== false) { - return $manager->get($username)->getUID(); + return $username->getUID(); } return false; } -- cgit v1.2.3 From 09b64535a9099bdf9c71fa96b3aab2e49206ffde Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 17:00:20 +0200 Subject: fixing copyright and add class documentation --- apps/files/appinfo/remote.php | 1 + .../sabre/aborteduploaddetectionplugin.php | 105 +++++++++++++++++++++ lib/connector/sabre/directory.php | 13 --- 3 files changed, 106 insertions(+), 13 deletions(-) create mode 100644 lib/connector/sabre/aborteduploaddetectionplugin.php (limited to 'lib') diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 9b114ca2e37..0c1f2e6580c 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -48,6 +48,7 @@ $defaults = new OC_Defaults(); $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName())); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload +$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin()); $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php new file mode 100644 index 00000000000..745c4a9942d --- /dev/null +++ b/lib/connector/sabre/aborteduploaddetectionplugin.php @@ -0,0 +1,105 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +/** + * Class OC_Connector_Sabre_AbortedUploadDetectionPlugin + * + * This plugin will verify if the uploaded data has been stored completely. + * This is done by comparing the content length of the request with the file size on storage. + */ +class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPlugin { + + /** + * Reference to main server object + * + * @var Sabre_DAV_Server + */ + private $server; + + /** + * is kept public to allow overwrite for unit testing + * + * @var \OC\Files\View + */ + public $fileView; + + /** + * This initializes the plugin. + * + * This function is called by Sabre_DAV_Server, after + * addPlugin is called. + * + * This method should set up the requires event subscriptions. + * + * @param Sabre_DAV_Server $server + * @return void + */ + public function initialize(Sabre_DAV_Server $server) { + + $this->server = $server; + + $server->subscribeEvent('afterCreateFile', array($this, 'afterCreateFile'), 10); + $server->subscribeEvent('afterWriteContent', array($this, 'afterWriteContent'), 10); + } + + function afterCreateFile($path, Sabre_DAV_ICollection $parent) { + + $this->verifyContentLength($path); + + } + + function afterWriteContent($path, Sabre_DAV_IFile $node) { + $path = $path .'/'.$node->getName(); + $this->verifyContentLength($path); + } + + function verifyContentLength($filePath) { + + // ownCloud chunked upload will be handled in it's own plugin + $chunkHeader = $this->server->httpRequest->getHeader('OC-Chunked'); + if ($chunkHeader) { + return; + } + + // compare expected and actual size + $expected = $this->getLength(); + $actual = $this->getFileView()->filesize($filePath); + if ($actual != $expected) { + $this->getFileView()->unlink($filePath); + throw new Sabre_DAV_Exception_BadRequest('expected filesize ' . $expected . ' got ' . $actual); + } + + } + + /** + * @return string + */ + public function getLength() + { + $req = $this->server->httpRequest; + $length = $req->getHeader('X-Expected-Entity-Length'); + if (!$length) { + $length = $req->getHeader('Content-Length'); + } + + return $length; + } + + /** + * @return \OC\Files\View + */ + public function getFileView() + { + if (is_null($this->fileView)) { + // initialize fileView + $this->fileView = \OC\Files\Filesystem::getView(); + } + + return $this->fileView; + } +} diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 3181a4b310f..29374f7a6cf 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -74,19 +74,6 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa \OC\Files\Filesystem::file_put_contents($partpath, $data); - //detect aborted upload - if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) { - if (isset($_SERVER['CONTENT_LENGTH'])) { - $expected = $_SERVER['CONTENT_LENGTH']; - $actual = \OC\Files\Filesystem::filesize($partpath); - if ($actual != $expected) { - \OC\Files\Filesystem::unlink($partpath); - throw new Sabre_DAV_Exception_BadRequest( - 'expected filesize ' . $expected . ' got ' . $actual); - } - } - } - // rename to correct path \OC\Files\Filesystem::rename($partpath, $newPath); -- cgit v1.2.3 From 5e27ac4b1ade3a78941ced1eef5aaa2d2df0cedf Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 17:17:29 +0200 Subject: $path already contains the full path to the file --- lib/connector/sabre/aborteduploaddetectionplugin.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php index 745c4a9942d..1173ff2f9aa 100644 --- a/lib/connector/sabre/aborteduploaddetectionplugin.php +++ b/lib/connector/sabre/aborteduploaddetectionplugin.php @@ -54,7 +54,6 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl } function afterWriteContent($path, Sabre_DAV_IFile $node) { - $path = $path .'/'.$node->getName(); $this->verifyContentLength($path); } -- cgit v1.2.3 From 0c44cdd4eaa82687bce4dbbb24338b16a3f4ed13 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 25 Sep 2013 17:28:45 +0200 Subject: remove unneccessary code --- .../sabre/aborteduploaddetectionplugin.php | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php index 1173ff2f9aa..74c26f41b65 100644 --- a/lib/connector/sabre/aborteduploaddetectionplugin.php +++ b/lib/connector/sabre/aborteduploaddetectionplugin.php @@ -43,21 +43,16 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl $this->server = $server; - $server->subscribeEvent('afterCreateFile', array($this, 'afterCreateFile'), 10); - $server->subscribeEvent('afterWriteContent', array($this, 'afterWriteContent'), 10); + $server->subscribeEvent('afterCreateFile', array($this, 'verifyContentLength'), 10); + $server->subscribeEvent('afterWriteContent', array($this, 'verifyContentLength'), 10); } - function afterCreateFile($path, Sabre_DAV_ICollection $parent) { - - $this->verifyContentLength($path); - - } - - function afterWriteContent($path, Sabre_DAV_IFile $node) { - $this->verifyContentLength($path); - } - - function verifyContentLength($filePath) { + /** + * @param $filePath + * @param Sabre_DAV_INode $node + * @throws Sabre_DAV_Exception_BadRequest + */ + public function verifyContentLength($filePath, Sabre_DAV_INode $node = null) { // ownCloud chunked upload will be handled in it's own plugin $chunkHeader = $this->server->httpRequest->getHeader('OC-Chunked'); @@ -67,6 +62,9 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl // compare expected and actual size $expected = $this->getLength(); + if (!$expected) { + return; + } $actual = $this->getFileView()->filesize($filePath); if ($actual != $expected) { $this->getFileView()->unlink($filePath); -- cgit v1.2.3 From b11d8799c17b24e7823de8d8dc171fb78f9b8442 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 26 Sep 2013 10:50:15 +0200 Subject: adding unit tests for ObjectTree::move() --- lib/connector/sabre/objecttree.php | 44 ++++++++----- tests/lib/connector/sabre/objecttree.php | 104 +++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 14 deletions(-) create mode 100644 tests/lib/connector/sabre/objecttree.php (limited to 'lib') diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php index 7accf98c8e1..80c3840b99d 100644 --- a/lib/connector/sabre/objecttree.php +++ b/lib/connector/sabre/objecttree.php @@ -11,6 +11,14 @@ namespace OC\Connector\Sabre; use OC\Files\Filesystem; class ObjectTree extends \Sabre_DAV_ObjectTree { + + /** + * keep this public to allow mock injection during unit test + * + * @var \OC\Files\View + */ + public $fileView; + /** * Returns the INode object for the requested path * @@ -21,14 +29,16 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { public function getNodeForPath($path) { $path = trim($path, '/'); - if (isset($this->cache[$path])) return $this->cache[$path]; + if (isset($this->cache[$path])) { + return $this->cache[$path]; + } // Is it the root node? if (!strlen($path)) { return $this->rootNode; } - $info = Filesystem::getFileInfo($path); + $info = $this->getFileView()->getFileInfo($path); if (!$info) { throw new \Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); @@ -65,25 +75,21 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath); // check update privileges - if ($sourceDir === $destinationDir) { - // for renaming it's enough to check if the sourcePath can be updated - if (!\OC\Files\Filesystem::isUpdatable($sourcePath)) { - throw new \Sabre_DAV_Exception_Forbidden(); - } - } else { + $fs = $this->getFileView(); + if (!$fs->isUpdatable($sourcePath)) { + throw new \Sabre_DAV_Exception_Forbidden(); + } + if ($sourceDir !== $destinationDir) { // for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir - if (!\OC\Files\Filesystem::isUpdatable($sourcePath)) { - throw new \Sabre_DAV_Exception_Forbidden(); - } - if (!\OC\Files\Filesystem::isUpdatable($sourceDir)) { + if (!$fs->isUpdatable($sourceDir)) { throw new \Sabre_DAV_Exception_Forbidden(); } - if (!\OC\Files\Filesystem::isUpdatable($destinationDir)) { + if (!$fs->isUpdatable($destinationDir)) { throw new \Sabre_DAV_Exception_Forbidden(); } } - $renameOkay = Filesystem::rename($sourcePath, $destinationPath); + $renameOkay = $fs->rename($sourcePath, $destinationPath); if (!$renameOkay) { throw new \Sabre_DAV_Exception_Forbidden(''); } @@ -123,4 +129,14 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destination); $this->markDirty($destinationDir); } + + /** + * @return \OC\Files\View + */ + public function getFileView() { + if (is_null($this->fileView)) { + $this->fileView = \OC\Files\Filesystem::getView(); + } + return $this->fileView; + } } diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php new file mode 100644 index 00000000000..c920441c8b4 --- /dev/null +++ b/tests/lib/connector/sabre/objecttree.php @@ -0,0 +1,104 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\OC\Connector\Sabre; + + +use OC_Connector_Sabre_Directory; +use PHPUnit_Framework_TestCase; +use Sabre_DAV_Exception_Forbidden; + +class TestDoubleFileView extends \OC\Files\View{ + + public function __construct($updatables, $canRename = true) { + $this->updatables = $updatables; + $this->canRename = $canRename; + } + + public function isUpdatable($path) { + return $this->updatables[$path]; + } + + public function rename($path1, $path2) { + return $this->canRename; + } +} + +class ObjectTree extends PHPUnit_Framework_TestCase { + + /** + * @dataProvider moveFailedProvider + * @expectedException Sabre_DAV_Exception_Forbidden + */ + public function testMoveFailed($source, $dest, $updatables) { + $rootDir = new OC_Connector_Sabre_Directory(''); + $objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree', + array('nodeExists', 'getNodeForPath'), + array($rootDir)); + + $objectTree->expects($this->once()) + ->method('getNodeForPath') + ->with($this->identicalTo('a/b')) + ->will($this->returnValue(false)); + + /** @var $objectTree \OC\Connector\Sabre\ObjectTree */ + $objectTree->fileView = new TestDoubleFileView($updatables); + $objectTree->move($source, $dest); + } + + /** + * @dataProvider moveSuccessProvider + */ + public function testMoveSuccess($source, $dest, $updatables) { + $rootDir = new OC_Connector_Sabre_Directory(''); + $objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree', + array('nodeExists', 'getNodeForPath'), + array($rootDir)); + + $objectTree->expects($this->once()) + ->method('getNodeForPath') + ->with($this->identicalTo('a/b')) + ->will($this->returnValue(false)); + + /** @var $objectTree \OC\Connector\Sabre\ObjectTree */ + $objectTree->fileView = new TestDoubleFileView($updatables); + $objectTree->move($source, $dest); + $this->assertTrue(true); + } + + function moveFailedProvider() { + return array( + array('a/b', 'a/c', array('a' => false, 'a/b' => false, 'a/c' => false)), + array('a/b', 'b/b', array('a' => false, 'a/b' => false, 'b' => false, 'b/b' => false)), + array('a/b', 'b/b', array('a' => false, 'a/b' => true, 'b' => false, 'b/b' => false)), + array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => false, 'b/b' => false)), + ); + } + + function moveSuccessProvider() { + return array( + array('a/b', 'a/c', array('a' => false, 'a/b' => true, 'a/c' => false)), + array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false)), + ); + } + +// private function buildFileViewMock($updatables) { +// // mock filesysten +// $view = $this->getMock('\OC\Files\View', array('isUpdatable'), array(), '', FALSE); +// +// foreach ($updatables as $path => $updatable) { +// $view->expects($this->any()) +// ->method('isUpdatable') +// ->with($this->identicalTo($path)) +// ->will($this->returnValue($updatable)); +// } +// +// return $view; +// } + +} -- cgit v1.2.3 From e515509a817d06e646a7781fc2456fde227d2154 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 26 Sep 2013 13:34:47 +0200 Subject: prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded --- lib/user.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/user.php b/lib/user.php index da774ff86f0..62c2f318ccc 100644 --- a/lib/user.php +++ b/lib/user.php @@ -177,6 +177,7 @@ class OC_User { * setup the configured backends in config.php */ public static function setupBackends() { + OC_App::loadApps(array('prelogin')); $backends = OC_Config::getValue('user_backends', array()); foreach ($backends as $i => $config) { $class = $config['class']; -- cgit v1.2.3 From 9bb244cc59504b3686b58183315d046084b05fa6 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 26 Sep 2013 19:34:28 +0200 Subject: check every enabled app if the remember login feature needs to be disabled --- lib/util.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index e12f753d5ae..e1bec4aece3 100755 --- a/lib/util.php +++ b/lib/util.php @@ -511,13 +511,23 @@ class OC_Util { /** * Check if it is allowed to remember login. - * E.g. if encryption is enabled the user needs to log-in every time he visites - * ownCloud in order to decrypt the private key. + * + * @note Every app can set 'rememberlogin' to 'false' to disable the remember login feature * * @return bool */ public static function rememberLoginAllowed() { - return !OC_App::isEnabled('files_encryption'); + + $apps = OC_App::getEnabledApps(); + + foreach ($apps as $app) { + $appInfo = OC_App::getAppInfo($app); + if (isset($appInfo['rememberlogin']) && $appInfo['rememberlogin'] === 'false') { + return false; + } + + } + return true; } /** -- cgit v1.2.3 From f31d31844e0a498ccb0364fa618d55b33cc30236 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 27 Sep 2013 00:02:30 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/el.php | 1 + apps/files/l10n/hu_HU.php | 13 ++++++++++--- apps/files_trashbin/l10n/hu_HU.php | 4 ++-- apps/user_ldap/l10n/hu_HU.php | 8 ++++++++ core/l10n/cs_CZ.php | 1 + core/l10n/da.php | 2 ++ core/l10n/fr.php | 5 +++++ l10n/cs_CZ/core.po | 22 +++++++++++----------- l10n/da/core.po | 22 +++++++++++----------- l10n/da/lib.po | 18 +++++++++--------- l10n/da/settings.po | 6 +++--- l10n/el/files.po | 11 ++++++----- l10n/fr/core.po | 16 ++++++++-------- l10n/fr/settings.po | 30 +++++++++++++++--------------- l10n/hu_HU/files.po | 34 +++++++++++++++++----------------- l10n/hu_HU/files_trashbin.po | 30 +++++++++++++++--------------- l10n/hu_HU/user_ldap.po | 22 +++++++++++----------- 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_trashbin.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/da.php | 3 +++ settings/l10n/da.php | 1 + settings/l10n/fr.php | 3 +++ 31 files changed, 153 insertions(+), 121 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 37a61c6b956..de524f4dd90 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις", "Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.", +"Error moving file" => "Σφάλμα κατά τη μετακίνηση του αρχείου", "Name" => "Όνομα", "Size" => "Μέγεθος", "Modified" => "Τροποποιήθηκε", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 5d313ff2488..4dd6a13d320 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", "Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Not enough storage available" => "Nincs elég szabad hely.", +"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.", +"Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.", "Invalid directory." => "Érvénytelen mappa.", "Files" => "Fájlok", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Not enough space available" => "Nincs elég szabad hely", "Upload cancelled." => "A feltöltést megszakítottuk.", +"Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.", "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.", "URL cannot be empty." => "Az URL nem lehet semmi.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés", @@ -31,15 +35,18 @@ $TRANSLATIONS = array( "cancel" => "mégse", "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}", "undo" => "visszavonás", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n mappa","%n mappa"), +"_%n file_::_%n files_" => array("%n állomány","%n állomány"), +"{dirs} and {files}" => "{dirs} és {files}", +"_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"), "'.' is an invalid file name." => "'.' fájlnév érvénytelen.", "File name cannot be empty." => "A fájlnév nem lehet semmi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.", "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.", "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.", +"Error moving file" => "Az állomány áthelyezése nem sikerült.", "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php index aac6cf78000..766ddcbce4d 100644 --- a/apps/files_trashbin/l10n/hu_HU.php +++ b/apps/files_trashbin/l10n/hu_HU.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Végleges törlés", "Name" => "Név", "Deleted" => "Törölve", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n mappa"), +"_%n file_::_%n files_" => array("","%n állomány"), "restored" => "visszaállítva", "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!", "Restore" => "Visszaállítás", diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php index 6961869f3e0..b41cf98e2b9 100644 --- a/apps/user_ldap/l10n/hu_HU.php +++ b/apps/user_ldap/l10n/hu_HU.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült", "Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?", "Confirm Deletion" => "A törlés megerősítése", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. 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 is not installed, the backend will not work. Please ask your system administrator to install it." => "Figyelmeztetés: Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!", "Server configuration" => "A kiszolgálók beállításai", "Add Server Configuration" => "Új kiszolgáló beállításának hozzáadása", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "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. Example: \"uid=%%uid\"" => "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. Például: \"uid=%%uid\"", "User List Filter" => "A felhasználók szűrője", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Ez a szűrő érvényes a felhasználók listázásakor (nincs helyettesíthető változó). Például: \"objectClass=person\"", "Group Filter" => "A csoportok szűrője", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Ez a szűrő érvényes a csoportok listázásakor (nincs helyettesíthető változó). Például: \"objectClass=posixGroup\"", "Connection Settings" => "Kapcsolati beállítások", "Configuration Active" => "A beállítás aktív", "When unchecked, this configuration will be skipped." => "Ha nincs kipipálva, ez a beállítás kihagyódik.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.", "Backup (Replica) Port" => "A másodkiszolgáló (replika) portszáma", "Disable Main Server" => "A fő szerver kihagyása", +"Only connect to the replica server." => "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.", "Use TLS" => "Használjunk TLS-t", "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS kapcsolatok esetén ne kapcsoljuk be, 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", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Használata nem javasolt (kivéve tesztelési céllal). 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 a(z) %s kiszolgálóra!", "Cache Time-To-Live" => "A gyorsítótár tárolási időtartama", "in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.", "Directory Settings" => "Címtár beállítások", "User Display Name Field" => "A felhasználónév mezője", +"The LDAP attribute to use to generate the user's display name." => "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve.", "Base User Tree" => "A felhasználói fa gyökere", "One User Base DN per line" => "Soronként egy felhasználói fa gyökerét adhatjuk meg", "User Search Attributes" => "A felhasználók lekérdezett attribútumai", "Optional; one attribute per line" => "Nem kötelező megadni, soronként egy attribútum", "Group Display Name Field" => "A csoport nevének mezője", +"The LDAP attribute to use to generate the groups's display name." => "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve.", "Base Group Tree" => "A csoportfa gyökere", "One Group Base DN per line" => "Soronként egy csoportfa gyökerét adhatjuk meg", "Group Search Attributes" => "A csoportok lekérdezett attribútumai", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 449a49f5686..abed4a0fdac 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"One file conflict" => "Jeden konflikt souboru", "Cancel" => "Zrušit", "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", diff --git a/core/l10n/da.php b/core/l10n/da.php index e2399fdc5cc..8938f2107fa 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "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.", +"Unknown filetype" => "Ukendt filtype", +"Invalid image" => "Ugyldigt billede", "Sunday" => "Søndag", "Monday" => "Mandag", "Tuesday" => "Tirsdag", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 29489e86b7f..e7cb75e53f0 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -19,6 +19,8 @@ $TRANSLATIONS = array( "No image or file provided" => "Aucune image ou fichier fourni", "Unknown filetype" => "Type de fichier inconnu", "Invalid image" => "Image invalide", +"No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.", +"No crop data provided" => "Aucune donnée de culture fournie", "Sunday" => "Dimanche", "Monday" => "Lundi", "Tuesday" => "Mardi", @@ -61,7 +63,10 @@ $TRANSLATIONS = array( "Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?", "If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.", "Cancel" => "Annuler", +"Continue" => "Poursuivre", +"(all selected)" => "(tous sélectionnés)", "({count} selected)" => "({count} sélectionnés)", +"Error loading file exists template" => "Erreur de chargement du modèle de fichier existant", "The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", "The app name is not specified." => "Le nom de l'application n'est pas spécifié.", diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 61a7e861b2a..40b693b988a 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-25 10:50+0000\n" +"Last-Translator: pstast \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" @@ -284,7 +284,7 @@ msgstr[2] "" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Jeden konflikt souboru" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" @@ -325,7 +325,7 @@ msgstr "Není určen typ objektu." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Chyba" @@ -345,7 +345,7 @@ msgstr "Sdílené" msgid "Share" msgstr "Sdílet" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Chyba při sdílení" @@ -445,23 +445,23 @@ msgstr "smazat" msgid "share" msgstr "sdílet" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Chráněno heslem" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Chyba při odstraňování data vypršení platnosti" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Chyba při nastavení data vypršení platnosti" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Odesílám ..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "E-mail odeslán" diff --git a/l10n/da/core.po b/l10n/da/core.po index 690bb46c211..89530e07456 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 17:20+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" @@ -100,11 +100,11 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Ukendt filtype" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Ugyldigt billede" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -319,7 +319,7 @@ msgstr "Objekttypen er ikke angivet." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Fejl" @@ -339,7 +339,7 @@ msgstr "Delt" msgid "Share" msgstr "Del" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Fejl under deling" @@ -439,23 +439,23 @@ msgstr "slet" msgid "share" msgstr "del" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Beskyttet med adgangskode" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Fejl ved fjernelse af udløbsdato" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Fejl under sætning af udløbsdato" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Sender ..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "E-mail afsendt" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 0bacfcf5e8a..7d01d7a9691 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 17:20+0000\n" +"Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,15 +58,15 @@ msgstr "Upgradering af \"%s\" fejlede" #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Personligt profilbillede virker endnu ikke sammen med kryptering" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Ukendt filtype" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Ugyldigt billede" #: defaults.php:35 msgid "web services under your control" @@ -167,15 +167,15 @@ msgstr "Adgangsfejl" msgid "Token expired. Please reload page." msgstr "Adgang er udløbet. Genindlæs siden." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Filer" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "SMS" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Billeder" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 7251a13d4ff..e5f2b57e882 100644 --- a/l10n/da/settings.po +++ b/l10n/da/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: 2013-09-24 12:58-0400\n" -"PO-Revision-Date: 2013-09-24 16:59+0000\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 17:00+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -114,7 +114,7 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Kunne ikke ændre kodeord" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/el/files.po b/l10n/el/files.po index f6b7bcf82a4..87c112acc67 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -5,14 +5,15 @@ # Translators: # Efstathios Iosifidis , 2013 # Efstathios Iosifidis , 2013 +# gtsamis , 2013 # frerisp , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-25 12:10+0000\n" +"Last-Translator: gtsamis \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" @@ -89,7 +90,7 @@ msgstr "" msgid "Invalid directory." msgstr "Μη έγκυρος φάκελος." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Αρχεία" @@ -224,7 +225,7 @@ msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να π #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 4c7f6be045a..bce932689a0 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" -"PO-Revision-Date: 2013-09-23 19:40+0000\n" -"Last-Translator: ogre_sympathique \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-26 15:10+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -110,11 +110,11 @@ msgstr "Image invalide" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau." #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Aucune donnée de culture fournie" #: js/config.php:32 msgid "Sunday" @@ -298,11 +298,11 @@ msgstr "Annuler" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Poursuivre" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(tous sélectionnés)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" @@ -310,7 +310,7 @@ msgstr "({count} sélectionnés)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Erreur de chargement du modèle de fichier existant" #: 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 diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 529e2e8c356..21918cf68da 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-26 15:00+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -102,18 +102,18 @@ msgstr "Aucun utilisateur fourni" msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" @@ -123,11 +123,11 @@ msgstr "Impossible de modifier le mot de passe" msgid "Update to {appversion}" msgstr "Mettre à jour vers {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Désactiver" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Activer" @@ -135,31 +135,31 @@ msgstr "Activer" msgid "Please wait...." msgstr "Veuillez patienter…" -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Erreur lors de la désactivation de l'application" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Erreur lors de l'activation de l'application" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Mise à jour..." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Erreur lors de la mise à jour de l'application" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Erreur" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Mettre à jour" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Mise à jour effectuée avec succès" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 51bd0806da3..e61d77e5cb2 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 18:40+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" @@ -77,23 +77,23 @@ msgstr "Nincs elég szabad hely." #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány." #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Érvénytelen mappa." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Fájlok" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll." #: js/file-upload.js:255 msgid "Not enough space available" @@ -105,7 +105,7 @@ msgstr "A feltöltést megszakítottuk." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "A kiszolgálótól nem kapható meg az eredmény." #: js/file-upload.js:446 msgid "" @@ -167,24 +167,24 @@ msgstr "visszavonás" #: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n mappa" +msgstr[1] "%n mappa" #: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n állomány" +msgstr[1] "%n állomány" #: js/filelist.js:541 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} és {files}" #: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n állomány feltöltése" +msgstr[1] "%n állomány feltöltése" #: js/files.js:25 msgid "'.' is an invalid file name." @@ -212,7 +212,7 @@ msgstr "A tároló majdnem tele van ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani." #: js/files.js:296 msgid "" @@ -222,7 +222,7 @@ msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Az állomány áthelyezése nem sikerült." #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 4e5d7207c9f..d0d6f3bc51a 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 18: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" @@ -28,43 +28,43 @@ msgstr "Nem sikerült %s végleges törlése" msgid "Couldn't restore %s" msgstr "Nem sikerült %s visszaállítása" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "a visszaállítás végrehajtása" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Hiba" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "az állomány végleges törlése" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Végleges törlés" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Név" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "Törölve" -#: js/trash.js:191 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n mappa" -#: js/trash.js:197 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n állomány" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trashbin.php:814 lib/trashbin.php:816 msgid "restored" msgstr "visszaállítva" @@ -72,11 +72,11 @@ msgstr "visszaállítva" msgid "Nothing in here. Your trash bin is empty!" msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "Visszaállítás" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Törlés" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 5b24b22ffd6..87a2b140468 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" +"PO-Revision-Date: 2013-09-24 19:00+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" @@ -92,7 +92,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. 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:12 msgid "" @@ -157,7 +157,7 @@ msgstr "Szűrő a bejelentkezéshez" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -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. Például: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -167,7 +167,7 @@ msgstr "A felhasználók szűrője" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Ez a szűrő érvényes a felhasználók listázásakor (nincs helyettesíthető változó). Például: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -177,7 +177,7 @@ msgstr "A csoportok szűrője" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Ez a szűrő érvényes a csoportok listázásakor (nincs helyettesíthető változó). Például: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -215,7 +215,7 @@ msgstr "A fő szerver kihagyása" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk." #: templates/settings.php:73 msgid "Use TLS" @@ -238,7 +238,7 @@ msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét" msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Használata nem javasolt (kivéve tesztelési céllal). 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 a(z) %s kiszolgálóra!" #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -258,7 +258,7 @@ msgstr "A felhasználónév mezője" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve." #: templates/settings.php:81 msgid "Base User Tree" @@ -282,7 +282,7 @@ msgstr "A csoport nevének mezője" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve." #: templates/settings.php:84 msgid "Base Group Tree" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index a57486f5ed2..ba60bef3718 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 23d0cd0b17b..601c6633925 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 44e17a2fcb2..52e8feed914 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 abdd985cfdf..a99fbf35c8a 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 34ed992660b..10bee89c275 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 45fa700a43b..cfc69f2b2e5 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 2e73cce980a..284aca099fd 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 0733e0c2737..0103b348e9c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 66c00629bd9..c14bb4c3e5b 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 919a39b4059..822d615af91 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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 dfb732ed0c9..3a0f240e937 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-24 12:58-0400\n" +"POT-Creation-Date: 2013-09-27 00:01-0400\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/da.php b/lib/l10n/da.php index 26903142763..05a43f42ed9 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Brugere", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Upgradering af \"%s\" fejlede", +"Custom profile pictures don't work with encryption yet" => "Personligt profilbillede virker endnu ikke sammen med kryptering", +"Unknown filetype" => "Ukendt filtype", +"Invalid image" => "Ugyldigt billede", "web services under your control" => "Webtjenester under din kontrol", "cannot open \"%s\"" => "Kan ikke åbne \"%s\"", "ZIP download is turned off." => "ZIP-download er slået fra.", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index fcff9dbcfd9..f86559d6752 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -21,6 +21,7 @@ $TRANSLATIONS = array( "Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt", "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", +"Unable to change password" => "Kunne ikke ændre kodeord", "Update to {appversion}" => "Opdatér til {appversion}", "Disable" => "Deaktiver", "Enable" => "Aktiver", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 55c0e7fe9a8..10a7d764bc8 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -18,6 +18,9 @@ $TRANSLATIONS = array( "Couldn't update app." => "Impossible de mettre à jour l'application", "Wrong password" => "Mot de passe incorrect", "No user supplied" => "Aucun utilisateur fourni", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues", +"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.", "Unable to change password" => "Impossible de modifier le mot de passe", "Update to {appversion}" => "Mettre à jour vers {appversion}", "Disable" => "Désactiver", -- cgit v1.2.3 From 03d5ea6cec4e88dad36648a931ff0f39a1da23ee Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 27 Sep 2013 13:34:48 +0200 Subject: check not only if the keyfile folder exists but also if it contains keyfiles --- lib/util.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 41f5f1d16be..dd6c72bfc7f 100755 --- a/lib/util.php +++ b/lib/util.php @@ -410,14 +410,18 @@ class OC_Util { $encryptedFiles = false; if (OC_App::isEnabled('files_encryption') === false) { $view = new OC\Files\View('/' . OCP\User::getUser()); - if ($view->file_exists('/files_encryption/keyfiles')) { - $encryptedFiles = true; + $keyfilePath = '/files_encryption/keyfiles'; + if ($view->is_dir($keyfilePath)) { + $dircontent = $view->getDirectoryContent($keyfilePath); + if (!empty($dircontent)) { + $encryptedFiles = true; + } } } - + return $encryptedFiles; } - + /** * @brief Check for correct file permissions of data directory * @paran string $dataDirectory @@ -654,16 +658,16 @@ class OC_Util { } return $value; } - + /** * @brief Public function to encode url parameters * * This function is used to encode path to file before output. * Encoding is done according to RFC 3986 with one exception: - * Character '/' is preserved as is. + * Character '/' is preserved as is. * * @param string $component part of URI to encode - * @return string + * @return string */ public static function encodePath($component) { $encoded = rawurlencode($component); @@ -810,7 +814,7 @@ class OC_Util { } } } - + /** * @brief Check if the connection to the internet is disabled on purpose * @return bool -- cgit v1.2.3 From adff34cb8a7c2e2a6046e4fe28da3a77cd6492ca Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 27 Sep 2013 17:08:48 +0200 Subject: fixing error in initialization of TagManager --- lib/server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/server.php b/lib/server.php index 2391952ea6b..cabb15324ec 100644 --- a/lib/server.php +++ b/lib/server.php @@ -51,7 +51,7 @@ class Server extends SimpleContainer implements IServerContainer { }); $this->registerService('TagManager', function($c) { $user = \OC_User::getUser(); - return new Tags($user); + return new TagManager($user); }); $this->registerService('RootFolder', function($c) { // TODO: get user and user manager from container as well -- cgit v1.2.3 From 57f37c876b59d11dae8b4325bed5fa57de52ecd4 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 27 Sep 2013 17:15:26 +0200 Subject: delay middleware registrations --- lib/appframework/dependencyinjection/dicontainer.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 54878266939..380a0ee6d4a 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -40,6 +40,10 @@ use OCP\IServerContainer; class DIContainer extends SimpleContainer implements IAppContainer{ + /** + * @var array + */ + private $middleWares; /** * Put your class dependencies in here @@ -89,6 +93,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{ $dispatcher = new MiddlewareDispatcher(); $dispatcher->registerMiddleware($c['SecurityMiddleware']); + foreach($this->middleWares as $middleWare) { + $dispatcher->registerMiddleware($middleWare); + } + return $dispatcher; }); @@ -125,10 +133,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ * @return boolean */ function registerMiddleWare(IMiddleWare $middleWare) { - /** @var $dispatcher MiddlewareDispatcher */ - $dispatcher = $this->query('MiddlewareDispatcher'); - $dispatcher->registerMiddleware($middleWare); - + array_push($this->middleWares, $middleWare); } /** -- cgit v1.2.3 From adcb738e47566d94a173116e86e3f5abe249dac1 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 28 Sep 2013 20:40:25 +0200 Subject: initialize $middleWares --- lib/appframework/dependencyinjection/dicontainer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php index 380a0ee6d4a..3755d45fa09 100644 --- a/lib/appframework/dependencyinjection/dicontainer.php +++ b/lib/appframework/dependencyinjection/dicontainer.php @@ -43,7 +43,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ /** * @var array */ - private $middleWares; + private $middleWares = array(); /** * Put your class dependencies in here -- cgit v1.2.3 From b6fc143074ae55bc6f9732d825571681f88f46ed Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 31 May 2013 18:21:31 +0200 Subject: cURL does not honour default_socket_timeout SabreDAV uses cURL for the requests and as this does not honour default_socket_timeout, setting it is useless and confusing as people will expect the request to timeout faster than it actually will do. One has to use curl_setopt($curl, CURLOPT_TIMEOUT, x) or curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x) but there is currently no way to make SabreDAV pass this to cURL. --- lib/util.php | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 41f5f1d16be..d4f4eed1ca7 100755 --- a/lib/util.php +++ b/lib/util.php @@ -730,12 +730,6 @@ class OC_Util { 'baseUri' => OC_Helper::linkToRemote('webdav'), ); - // save the old timeout so that we can restore it later - $oldTimeout = ini_get("default_socket_timeout"); - - // use a 5 sec timeout for the check. Should be enough for local requests. - ini_set("default_socket_timeout", 5); - $client = new \Sabre_DAV_Client($settings); // for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. @@ -752,9 +746,6 @@ class OC_Util { $return = false; } - // restore the original timeout - ini_set("default_socket_timeout", $oldTimeout); - return $return; } -- cgit v1.2.3 From aaba0d83b5e9f8b67a739e74172da9464fa562b0 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 30 Sep 2013 10:03:07 +0200 Subject: fixing PHPDoc & typo --- lib/connector/sabre/aborteduploaddetectionplugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php index 74c26f41b65..15dca3a6809 100644 --- a/lib/connector/sabre/aborteduploaddetectionplugin.php +++ b/lib/connector/sabre/aborteduploaddetectionplugin.php @@ -37,7 +37,6 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl * This method should set up the requires event subscriptions. * * @param Sabre_DAV_Server $server - * @return void */ public function initialize(Sabre_DAV_Server $server) { @@ -54,7 +53,7 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl */ public function verifyContentLength($filePath, Sabre_DAV_INode $node = null) { - // ownCloud chunked upload will be handled in it's own plugin + // ownCloud chunked upload will be handled in its own plugin $chunkHeader = $this->server->httpRequest->getHeader('OC-Chunked'); if ($chunkHeader) { return; -- cgit v1.2.3 From a711399e62d5a9f14d4b748efe4354ee37e61f13 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 30 Sep 2013 10:19:22 -0400 Subject: [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 1 + apps/files/l10n/it.php | 6 ++-- apps/files/l10n/ja_JP.php | 5 +++ apps/files/l10n/ko.php | 17 ++++++++-- apps/files/l10n/lt_LT.php | 5 +++ apps/files/l10n/pl.php | 5 +++ apps/files_sharing/l10n/ko.php | 7 ++++ apps/files_trashbin/l10n/ko.php | 14 ++++++-- apps/files_versions/l10n/ko.php | 3 ++ apps/user_ldap/l10n/hu_HU.php | 1 + apps/user_webdavauth/l10n/hu_HU.php | 4 ++- core/l10n/cs_CZ.php | 2 ++ core/l10n/hu_HU.php | 21 ++++++++++++ core/l10n/ja_JP.php | 10 +++++- core/l10n/lt_LT.php | 9 ++++- core/l10n/pl.php | 8 ++++- l10n/cs_CZ/core.po | 11 +++--- l10n/cs_CZ/files.po | 11 +++--- l10n/hu_HU/core.po | 62 ++++++++++++++++----------------- l10n/hu_HU/lib.po | 52 ++++++++++++++-------------- l10n/hu_HU/settings.po | 68 ++++++++++++++++++------------------- l10n/hu_HU/user_ldap.po | 8 ++--- l10n/hu_HU/user_webdavauth.po | 10 +++--- l10n/it/files.po | 12 +++---- l10n/it/settings.po | 30 ++++++++-------- l10n/ja_JP/core.po | 38 ++++++++++----------- l10n/ja_JP/files.po | 18 +++++----- l10n/ja_JP/settings.po | 48 +++++++++++++------------- l10n/ko/files.po | 37 ++++++++++---------- l10n/ko/files_sharing.po | 21 ++++++------ l10n/ko/files_trashbin.po | 49 +++++++++++++------------- l10n/ko/files_versions.po | 15 ++++---- l10n/ko/lib.po | 46 ++++++++++++------------- l10n/lt_LT/core.po | 40 +++++++++++----------- l10n/lt_LT/files.po | 18 +++++----- l10n/lt_LT/settings.po | 42 +++++++++++------------ l10n/pl/core.po | 38 ++++++++++----------- l10n/pl/files.po | 18 +++++----- l10n/pl/lib.po | 44 ++++++++++++------------ l10n/pl/settings.po | 44 ++++++++++++------------ 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_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 28 +++++++-------- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/hu_HU.php | 11 ++++-- lib/l10n/ko.php | 8 +++-- lib/l10n/pl.php | 7 ++-- settings/l10n/hu_HU.php | 19 +++++++++++ settings/l10n/ja_JP.php | 9 +++++ settings/l10n/lt_LT.php | 6 ++++ settings/l10n/pl.php | 7 ++++ 58 files changed, 583 insertions(+), 430 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index f67283ec6e8..f1e54ee5fc3 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.", "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.", +"Error moving file" => "Chyba při přesunu souboru", "Name" => "Název", "Size" => "Velikost", "Modified" => "Upraveno", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index c24d30ae368..44b4e341956 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -13,11 +13,11 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manca una cartella temporanea", "Failed to write to disk" => "Scrittura su disco non riuscita", "Not enough storage available" => "Spazio di archiviazione insufficiente", -"Upload failed. Could not get file info." => "Upload fallito. Impossibile ottenere informazioni sul file", -"Upload failed. Could not find uploaded file" => "Upload fallit. Impossibile trovare file caricato", +"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.", +"Upload failed. Could not find uploaded file" => "Caricamento non riuscito. Impossibile trovare il file caricato.", "Invalid directory." => "Cartella non valida.", "Files" => "File", -"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Not enough space available" => "Spazio disponibile insufficiente", "Upload cancelled." => "Invio annullato", "Could not get result from server." => "Impossibile ottenere il risultato dal server.", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 5944b47434d..07ee96f1eb6 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "一時保存フォルダが見つかりません", "Failed to write to disk" => "ディスクへの書き込みに失敗しました", "Not enough storage available" => "ストレージに十分な空き容量がありません", +"Upload failed. Could not get file info." => "アップロードに失敗。ファイル情報を取得できませんでした。", +"Upload failed. Could not find uploaded file" => "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。", "Invalid directory." => "無効なディレクトリです。", "Files" => "ファイル", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Not enough space available" => "利用可能なスペースが十分にありません", "Upload cancelled." => "アップロードはキャンセルされました。", +"Could not get result from server." => "サーバから結果を取得できませんでした。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "URL cannot be empty." => "URLは空にできません。", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。", "Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。", +"Error moving file" => "ファイルの移動エラー", "Name" => "名前", "Size" => "サイズ", "Modified" => "変更", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 502acefcf3a..0174f8d0d21 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -2,6 +2,8 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함", "Could not move %s" => "%s 항목을 이딩시키지 못하였음", +"Unable to set upload directory." => "업로드 디렉터리를 정할수 없습니다", +"Invalid Token" => "잘못된 토큰", "No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다", "There is no error, the file uploaded with success" => "파일 업로드에 성공하였습니다.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:", @@ -11,12 +13,17 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "임시 폴더가 없음", "Failed to write to disk" => "디스크에 쓰지 못했습니다", "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.", +"Upload failed. Could not get file info." => "업로드에 실패했습니다. 파일 정보를 가져올수 없습니다.", +"Upload failed. Could not find uploaded file" => "업로드에 실패했습니다. 업로드할 파일을 찾을수 없습니다", "Invalid directory." => "올바르지 않은 디렉터리입니다.", "Files" => "파일", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename}을 업로드 할수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Not enough space available" => "여유 공간이 부족합니다", "Upload cancelled." => "업로드가 취소되었습니다.", +"Could not get result from server." => "서버에서 결과를 가져올수 없습니다.", "File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "URL cannot be empty." => "URL을 입력해야 합니다.", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "유효하지 않은 폴더명입니다. \"Shared\" 이름의 사용은 OwnCloud 가 이미 예약하고 있습니다.", "Error" => "오류", "Share" => "공유", "Delete permanently" => "영원히 삭제", @@ -28,18 +35,22 @@ $TRANSLATIONS = array( "cancel" => "취소", "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨", "undo" => "되돌리기", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), -"_Uploading %n file_::_Uploading %n files_" => array(""), +"_%n folder_::_%n folders_" => array("폴더 %n"), +"_%n file_::_%n files_" => array("파일 %n 개"), +"{dirs} and {files}" => "{dirs} 그리고 {files}", +"_Uploading %n file_::_Uploading %n files_" => array("%n 개의 파일을 업로드중"), "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.", "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.", "Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!", "Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "암호화는 해제되어 있지만, 파일은 아직 암호화 되어 있습니다. 개인 설저에 가셔서 암호를 해제하십시오", "Your download is being prepared. This might take some time if the files are big." => "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다.", +"Error moving file" => "파일 이동 오류", "Name" => "이름", "Size" => "크기", "Modified" => "수정됨", +"%s could not be renamed" => "%s 의 이름을 변경할수 없습니다", "Upload" => "업로드", "File handling" => "파일 처리", "Maximum upload size" => "최대 업로드 크기", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 2b32a129d55..d064b0c6523 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nėra laikinojo katalogo", "Failed to write to disk" => "Nepavyko įrašyti į diską", "Not enough storage available" => "Nepakanka vietos serveryje", +"Upload failed. Could not get file info." => "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.", +"Upload failed. Could not find uploaded file" => "Įkėlimas nepavyko. Nepavyko rasti įkelto failo", "Invalid directory." => "Neteisingas aplankas", "Files" => "Failai", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio", "Not enough space available" => "Nepakanka vietos", "Upload cancelled." => "Įkėlimas atšauktas.", +"Could not get result from server." => "Nepavyko gauti rezultato iš serverio.", "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", "URL cannot be empty." => "URL negali būti tuščias.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.", "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.", +"Error moving file" => "Klaida perkeliant failą", "Name" => "Pavadinimas", "Size" => "Dydis", "Modified" => "Pakeista", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 3ad80975810..50a247d2e0f 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -13,10 +13,14 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Brak folderu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", "Not enough storage available" => "Za mało dostępnego miejsca", +"Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.", +"Upload failed. Could not find uploaded file" => "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku", "Invalid directory." => "Zła ścieżka.", "Files" => "Pliki", +"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów", "Not enough space available" => "Za mało miejsca", "Upload cancelled." => "Wczytywanie anulowane.", +"Could not get result from server." => "Nie można uzyskać wyniku z serwera.", "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", "URL cannot be empty." => "URL nie może być pusty.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud", @@ -42,6 +46,7 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.", "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.", +"Error moving file" => "Błąd prz przenoszeniu pliku", "Name" => "Nazwa", "Size" => "Rozmiar", "Modified" => "Modyfikacja", diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php index f3a94a70979..f7eab1ac550 100644 --- a/apps/files_sharing/l10n/ko.php +++ b/apps/files_sharing/l10n/ko.php @@ -1,7 +1,14 @@ "비밀번호가 틀립니다. 다시 입력해주세요.", "Password" => "암호", "Submit" => "제출", +"Sorry, this link doesn’t seem to work anymore." => "죄송합니다만 이 링크는 더이상 작동되지 않습니다.", +"Reasons might be:" => "이유는 다음과 같을 수 있습니다:", +"the item was removed" => "이 항목은 삭제되었습니다", +"the link expired" => "링크가 만료되었습니다", +"sharing is disabled" => "공유가 비활성되었습니다", +"For more info, please ask the person who sent this link." => "더 자세한 설명은 링크를 보내신 분에게 여쭤보십시오", "%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다", "%s shared the file %s with you" => "%s 님이 파일 %s을(를) 공유하였습니다", "Download" => "다운로드", diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php index f2e604d7591..9ac5f9802c6 100644 --- a/apps/files_trashbin/l10n/ko.php +++ b/apps/files_trashbin/l10n/ko.php @@ -1,11 +1,19 @@ "%s를 영구적으로 삭제할수 없습니다", +"Couldn't restore %s" => "%s를 복원할수 없습니다", +"perform restore operation" => "복원 작업중", "Error" => "오류", +"delete file permanently" => "영구적으로 파일 삭제하기", "Delete permanently" => "영원히 삭제", "Name" => "이름", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), +"Deleted" => "삭제됨", +"_%n folder_::_%n folders_" => array("폴더 %n개"), +"_%n file_::_%n files_" => array("파일 %n개 "), +"restored" => "복원됨", +"Nothing in here. Your trash bin is empty!" => "현재 휴지통은 비어있습니다!", "Restore" => "복원", -"Delete" => "삭제" +"Delete" => "삭제", +"Deleted Files" => "삭제된 파일들" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php index 365adc25115..ba951c4107a 100644 --- a/apps/files_versions/l10n/ko.php +++ b/apps/files_versions/l10n/ko.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "되돌릴 수 없습니다: %s", "Versions" => "버전", +"Failed to revert {file} to revision {timestamp}." => "{timestamp} 판의 {file}로 돌리는데 실패했습니다.", +"More versions..." => "더 많은 버전들...", +"No other versions available" => "다른 버전을 사용할수 없습니다", "Restore" => "복원" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php index b41cf98e2b9..b43dcbc2c87 100644 --- a/apps/user_ldap/l10n/hu_HU.php +++ b/apps/user_ldap/l10n/hu_HU.php @@ -72,6 +72,7 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "A home könyvtár elérési útvonala", "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!", "Internal Username" => "Belső felhasználónév", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve...............................", "Internal Username Attribute:" => "A belső felhasználónév attribútuma:", "Override UUID detection" => "Az UUID-felismerés felülbírálása", "UUID Attribute:" => "UUID attribútum:", diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php index 63fc084ff4c..0b946e25e70 100644 --- a/apps/user_webdavauth/l10n/hu_HU.php +++ b/apps/user_webdavauth/l10n/hu_HU.php @@ -1,5 +1,7 @@ "WebDAV hitelesítés" +"WebDAV Authentication" => "WebDAV hitelesítés", +"Address: " => "Címek:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index abed4a0fdac..8b63079c87a 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -60,7 +60,9 @@ $TRANSLATIONS = array( "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), "One file conflict" => "Jeden konflikt souboru", +"Which files do you want to keep?" => "Které soubory chcete ponechat?", "Cancel" => "Zrušit", +"Continue" => "Pokračovat", "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index d893269ee81..107a5f04c05 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«", "group" => "csoport", +"Turned on maintenance mode" => "A karbantartási mód bekapcsolva", +"Turned off maintenance mode" => "A karbantartási mód kikapcsolva", +"Updated database" => "Frissítet adatbázis", +"Updating filecache, this may take really long..." => "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat...", +"Updated filecache" => "Filecache frissítve", +"... %d%% done ..." => "... %d%% kész ...", "Category type not provided." => "Nincs megadva a kategória típusa.", "No category to add?" => "Nincs hozzáadandó kategória?", "This category already exists: %s" => "Ez a kategória már létezik: %s", @@ -10,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Nem sikerült a kedvencekhez adni ezt: %s", "No categories selected for deletion." => "Nincs törlésre jelölt kategória", "Error removing %s from favorites." => "Nem sikerült a kedvencekből törölni ezt: %s", +"No image or file provided" => "Nincs kép vagy file megadva", +"Unknown filetype" => "Ismeretlen file tipús", +"Invalid image" => "Hibás kép", +"No temporary profile picture available, try again" => "Az átmeneti profil kép nem elérhető, próbáld újra", +"No crop data provided" => "Vágáshoz nincs adat megadva", "Sunday" => "vasárnap", "Monday" => "hétfő", "Tuesday" => "kedd", @@ -42,11 +53,20 @@ $TRANSLATIONS = array( "last year" => "tavaly", "years ago" => "több éve", "Choose" => "Válasszon", +"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}", "Yes" => "Igen", "No" => "Nem", "Ok" => "Ok", +"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"One file conflict" => "Egy file ütközik", +"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?", +"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.", "Cancel" => "Mégsem", +"Continue" => "Folytatás", +"(all selected)" => "(all selected)", +"({count} selected)" => "({count} kiválasztva)", +"Error loading file exists template" => "Hiba a létező sablon betöltésekor", "The object type is not specified." => "Az objektum típusa nincs megadva.", "Error" => "Hiba", "The app name is not specified." => "Az alkalmazás neve nincs megadva.", @@ -85,6 +105,7 @@ $TRANSLATIONS = array( "Email sent" => "Az emailt elküldtük", "The update was unsuccessful. Please report this issue to the ownCloud community." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az ownCloud közösséget.", "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.", +"%s password reset" => "%s jelszó visszaállítás", "Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {link}", "The link to reset your password has been sent to your email.
      If you do not receive it within a reasonable amount of time, check your spam/junk folders.
      If it is not there ask your local administrator ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának.
      Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját.
      Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.", "Request failed!
      Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni!
      Biztos, hogy jó emailcímet/felhasználónevet adott meg?", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 0baab441f95..110e5b21201 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -20,6 +20,7 @@ $TRANSLATIONS = array( "Unknown filetype" => "不明なファイルタイプ", "Invalid image" => "無効な画像", "No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試して下さい", +"No crop data provided" => "クロップデータは提供されません", "Sunday" => "日", "Monday" => "月", "Tuesday" => "火", @@ -57,8 +58,15 @@ $TRANSLATIONS = array( "No" => "いいえ", "Ok" => "OK", "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"), +"One file conflict" => "1ファイルが競合", +"Which files do you want to keep?" => "どちらのファイルを保持したいですか？", +"If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。", "Cancel" => "キャンセル", +"Continue" => "続ける", +"(all selected)" => "(全て選択)", +"({count} selected)" => "({count} 選択)", +"Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー", "The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", "The app name is not specified." => "アプリ名がしていされていません。", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 492aee12c1d..610e7aeadeb 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -58,8 +58,15 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Gerai", "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"), +"One file conflict" => "Vienas failo konfliktas", +"Which files do you want to keep?" => "Kuriuos failus norite laikyti?", +"If you select both versions, the copied file will have a number added to its name." => "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.", "Cancel" => "Atšaukti", +"Continue" => "Tęsti", +"(all selected)" => "(visi pažymėti)", +"({count} selected)" => "({count} pažymėtų)", +"Error loading file exists template" => "Klaida įkeliant esančių failų ruošinį", "The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", "The app name is not specified." => "Nenurodytas programos pavadinimas.", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 621038f79f7..ad467fe100e 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Błąd podczas dodawania %s do ulubionych.", "No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia.", "Error removing %s from favorites." => "Błąd podczas usuwania %s z ulubionych.", +"Unknown filetype" => "Nieznany typ pliku", +"Invalid image" => "Nieprawidłowe zdjęcie", "Sunday" => "Niedziela", "Monday" => "Poniedziałek", "Tuesday" => "Wtorek", @@ -51,8 +53,12 @@ $TRANSLATIONS = array( "Yes" => "Tak", "No" => "Nie", "Ok" => "OK", -"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"), +"One file conflict" => "Konflikt pliku", "Cancel" => "Anuluj", +"Continue" => "Kontynuuj ", +"(all selected)" => "(wszystkie zaznaczone)", +"({count} selected)" => "({count} zaznaczonych)", "The object type is not specified." => "Nie określono typu obiektu.", "Error" => "Błąd", "The app name is not specified." => "Nie określono nazwy aplikacji.", diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 40b693b988a..914c6bcc207 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -4,6 +4,7 @@ # # Translators: # janinko , 2013 +# dibalaj , 2013 # Honza K. , 2013 # Martin , 2013 # pstast , 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-27 00:01-0400\n" -"PO-Revision-Date: 2013-09-25 10:50+0000\n" -"Last-Translator: pstast \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 16:57+0000\n" +"Last-Translator: dibalaj \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" @@ -288,7 +289,7 @@ msgstr "Jeden konflikt souboru" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Které soubory chcete ponechat?" #: js/oc-dialogs.js:368 msgid "" @@ -302,7 +303,7 @@ msgstr "Zrušit" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Pokračovat" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 7ce4b330521..5cff84e574f 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# dibalaj , 2013 # Honza K. , 2013 # cvanca , 2013 # pstast , 2013 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-29 16:54+0000\n" +"Last-Translator: dibalaj \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" @@ -90,7 +91,7 @@ msgstr "" msgid "Invalid directory." msgstr "Neplatný adresář" -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Soubory" @@ -228,7 +229,7 @@ msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Chyba při přesunu souboru" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 7b484995d4b..9a7a4428b56 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 00:42+0000\n" +"Last-Translator: ebela \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" @@ -30,28 +30,28 @@ msgstr "csoport" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "A karbantartási mód bekapcsolva" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "A karbantartási mód kikapcsolva" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Frissítet adatbázis" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Filecache frissítve" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% kész ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -94,23 +94,23 @@ msgstr "Nem sikerült a kedvencekből törölni ezt: %s" #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Nincs kép vagy file megadva" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Ismeretlen file tipús" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Hibás kép" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Az átmeneti profil kép nem elérhető, próbáld újra" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "Vágáshoz nincs adat megadva" #: js/config.php:32 msgid "Sunday" @@ -250,7 +250,7 @@ msgstr "Válasszon" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -266,7 +266,7 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" -msgstr "" +msgstr "Nem sikerült betölteni az üzenet sablont: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" @@ -276,17 +276,17 @@ msgstr[1] "" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Egy file ütközik" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Melyik file-okat akarod megtartani?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -294,19 +294,19 @@ msgstr "Mégsem" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Folytatás" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(all selected)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} kiválasztva)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Hiba a létező sablon betöltésekor" #: 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 @@ -317,7 +317,7 @@ msgstr "Az objektum típusa nincs megadva." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Hiba" @@ -337,7 +337,7 @@ msgstr "Megosztott" msgid "Share" msgstr "Megosztás" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Nem sikerült létrehozni a megosztást" @@ -437,23 +437,23 @@ msgstr "töröl" msgid "share" msgstr "megoszt" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Jelszóval van védve" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Nem sikerült a lejárati időt törölni" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Nem sikerült a lejárati időt beállítani" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Küldés ..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "Az emailt elküldtük" @@ -471,7 +471,7 @@ msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatá #: lostpassword/controller.php:62 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s jelszó visszaállítás" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po index 6cd771a9024..57212087ee5 100644 --- a/l10n/hu_HU/lib.po +++ b/l10n/hu_HU/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 00:50+0000\n" +"Last-Translator: ebela \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,38 +19,38 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:239 +#: app.php:237 #, php-format msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." msgstr "" -#: app.php:250 +#: app.php:248 msgid "No app name specified" -msgstr "" +msgstr "Nincs az alkalmazás név megadva." -#: app.php:361 +#: app.php:352 msgid "Help" msgstr "Súgó" -#: app.php:374 +#: app.php:365 msgid "Personal" msgstr "Személyes" -#: app.php:385 +#: app.php:376 msgid "Settings" msgstr "Beállítások" -#: app.php:397 +#: app.php:388 msgid "Users" msgstr "Felhasználók" -#: app.php:410 +#: app.php:401 msgid "Admin" msgstr "Adminsztráció" -#: app.php:839 +#: app.php:832 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Sikertelen Frissítés \"%s\"." @@ -61,11 +61,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Ismeretlen file tipús" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Hibás kép" #: defaults.php:35 msgid "web services under your control" @@ -121,7 +121,7 @@ msgstr "" #: installer.php:125 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Az alkalmazás nem szolgáltatott info.xml file-t" #: installer.php:131 msgid "App can't be installed because of not allowed code in the App" @@ -131,7 +131,7 @@ msgstr "" msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával." #: installer.php:146 msgid "" @@ -147,12 +147,12 @@ msgstr "" #: installer.php:162 msgid "App directory already exists" -msgstr "" +msgstr "Az alkalmazás mappája már létezik" #: installer.php:175 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s" #: json.php:28 msgid "Application is not enabled" @@ -166,15 +166,15 @@ msgstr "Azonosítási hiba" msgid "Token expired. Please reload page." msgstr "A token lejárt. Frissítse az oldalt." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fájlok" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Szöveg" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Képek" @@ -278,6 +278,11 @@ msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok msgid "Please double check the installation guides." msgstr "Kérjük tüzetesen tanulmányozza át a telepítési útmutatót." +#: tags.php:194 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "Ez a kategória nem található: \"%s\"" + #: template/functions.php:96 msgid "seconds ago" msgstr "pár másodperce" @@ -329,8 +334,3 @@ msgstr "több éve" #: template.php:297 msgid "Caused by:" msgstr "Okozta:" - -#: vcategories.php:188 vcategories.php:249 -#, php-format -msgid "Could not find category \"%s\"" -msgstr "Ez a kategória nem található: \"%s\"" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 7ef4a07d1ae..f1bb5c03cfe 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:17-0400\n" +"PO-Revision-Date: 2013-09-30 00:21+0000\n" +"Last-Translator: ebela \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" @@ -89,42 +89,42 @@ msgstr "A program frissítése nem sikerült." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Hibás jelszó" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nincs felhasználó által mellékelve" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik." #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Nem sikerült megváltoztatni a jelszót" #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Frissítés erre a verzióra: {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Letiltás" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "engedélyezve" @@ -132,43 +132,43 @@ msgstr "engedélyezve" msgid "Please wait...." msgstr "Kérem várjon..." -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" -msgstr "" +msgstr "Hiba az alkalmazás kikapcsolása közben" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" -msgstr "" +msgstr "Hiba az alalmazás engedélyezése közben" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Frissítés folyamatban..." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Hiba történt a programfrissítés közben" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Hiba" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Frissítés" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Frissítve" -#: js/personal.js:220 +#: js/personal.js:221 msgid "Select a profile picture" -msgstr "" +msgstr "Válassz profil képet" -#: js/personal.js:265 +#: js/personal.js:266 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..." -#: js/personal.js:287 +#: js/personal.js:288 msgid "Saving..." msgstr "Mentés..." @@ -496,27 +496,27 @@ msgstr "Profilkép" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Új feltöltése" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Új kiválasztása Fileokból" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Kép eltávolítása" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Megszakítás" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Válassz profil képet" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" @@ -543,15 +543,15 @@ msgstr "Titkosítás" #: templates/personal.php:140 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "A titkosító alkalmzás a továbbiakban nincs engedélyezve, kititkosítja az összes fileodat" #: templates/personal.php:146 msgid "Log-in password" -msgstr "" +msgstr "Bejelentkezési jelszó" #: templates/personal.php:151 msgid "Decrypt all Files" -msgstr "" +msgstr "Kititkosítja az összes file-t" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 87a2b140468..b1d5e5391c8 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-27 00:01-0400\n" -"PO-Revision-Date: 2013-09-24 19:00+0000\n" -"Last-Translator: Laszlo Tornoci \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 00:22+0000\n" +"Last-Translator: ebela \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" @@ -348,7 +348,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve..............................." #: templates/settings.php:100 msgid "Internal Username Attribute:" diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po index fd49829f9c5..35d7f6c9136 100644 --- a/l10n/hu_HU/user_webdavauth.po +++ b/l10n/hu_HU/user_webdavauth.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 00:32+0000\n" +"Last-Translator: ebela \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" @@ -25,11 +25,11 @@ msgstr "WebDAV hitelesítés" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Címek:" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz." diff --git a/l10n/it/files.po b/l10n/it/files.po index 4711aa723a8..3b8b0f65394 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:51-0400\n" -"PO-Revision-Date: 2013-09-21 17:50+0000\n" -"Last-Translator: polxmod \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-30 12:15+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" @@ -78,11 +78,11 @@ msgstr "Spazio di archiviazione insufficiente" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "Upload fallito. Impossibile ottenere informazioni sul file" +msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "Upload fallit. Impossibile trovare file caricato" +msgstr "Caricamento non riuscito. Impossibile trovare il file caricato." #: ajax/upload.php:160 msgid "Invalid directory." @@ -94,7 +94,7 @@ msgstr "File" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte" +msgstr "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte." #: js/file-upload.js:255 msgid "Not enough space available" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 0e5f28a4d15..8248b45ef24 100644 --- a/l10n/it/settings.po +++ b/l10n/it/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: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:17-0400\n" +"PO-Revision-Date: 2013-09-30 12:15+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" @@ -121,11 +121,11 @@ msgstr "Impossibile cambiare la password" msgid "Update to {appversion}" msgstr "Aggiorna a {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Disabilita" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Abilita" @@ -133,43 +133,43 @@ msgstr "Abilita" msgid "Please wait...." msgstr "Attendere..." -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Errore durante la disattivazione" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Errore durante l'attivazione" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Aggiornamento in corso..." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Errore durante l'aggiornamento" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Errore" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Aggiorna" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Aggiornato" -#: js/personal.js:220 +#: js/personal.js:221 msgid "Select a profile picture" msgstr "Seleziona un'immagine del profilo" -#: js/personal.js:265 +#: js/personal.js:266 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo." -#: js/personal.js:287 +#: js/personal.js:288 msgid "Saving..." msgstr "Salvataggio in corso..." diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 0e8b19b17e3..73ad535aee2 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/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: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 06:25+0000\n" +"Last-Translator: Daisuke Deguchi \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" @@ -112,7 +112,7 @@ msgstr "一時的なプロファイル用画像が利用できません。もう #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "" +msgstr "クロップデータは提供されません" #: js/config.php:32 msgid "Sunday" @@ -269,21 +269,21 @@ msgstr "メッセージテンプレートの読み込みエラー: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" +msgstr[0] "{count} ファイルが競合" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "1ファイルが競合" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "どちらのファイルを保持したいですか？" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。" #: js/oc-dialogs.js:376 msgid "Cancel" @@ -291,19 +291,19 @@ msgstr "キャンセル" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "続ける" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(全て選択)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} 選択)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -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 @@ -314,7 +314,7 @@ msgstr "オブジェクタイプが指定されていません。" #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "エラー" @@ -334,7 +334,7 @@ msgstr "共有中" msgid "Share" msgstr "共有" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "共有でエラー発生" @@ -434,23 +434,23 @@ msgstr "削除" msgid "share" msgstr "共有" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "パスワード保護" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "有効期限の未設定エラー" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "有効期限の設定でエラー発生" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "送信中..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "メールを送信しました" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index b712c8b95a9..23062b05965 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-30 06:27+0000\n" +"Last-Translator: Daisuke Deguchi \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" @@ -81,23 +81,23 @@ msgstr "ストレージに十分な空き容量がありません" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "アップロードに失敗。ファイル情報を取得できませんでした。" #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "無効なディレクトリです。" -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "ファイル" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "ディレクトリもしくは0バイトのため {filename} をアップロードできません" #: js/file-upload.js:255 msgid "Not enough space available" @@ -109,7 +109,7 @@ msgstr "アップロードはキャンセルされました。" #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "サーバから結果を取得できませんでした。" #: js/file-upload.js:446 msgid "" @@ -223,7 +223,7 @@ msgstr "ダウンロードの準備中です。ファイルサイズが大きい #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "ファイルの移動エラー" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index c9851b54dea..9414aa1720c 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:17-0400\n" +"PO-Revision-Date: 2013-09-30 06:33+0000\n" +"Last-Translator: Daisuke Deguchi \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" @@ -89,42 +89,42 @@ msgstr "アプリを更新出来ませんでした。" #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "無効なパスワード" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "ユーザが指定されていません" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。" #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。" #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "パスワードを変更できません" #: js/apps.js:43 msgid "Update to {appversion}" msgstr "{appversion} に更新" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "無効" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "有効化" @@ -132,43 +132,43 @@ msgstr "有効化" msgid "Please wait...." msgstr "しばらくお待ちください。" -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "アプリ無効化中にエラーが発生" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "アプリ有効化中にエラーが発生" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "更新中...." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "アプリの更新中にエラーが発生" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "エラー" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "更新" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "更新済み" -#: js/personal.js:220 +#: js/personal.js:221 msgid "Select a profile picture" msgstr "プロファイル画像を選択" -#: js/personal.js:265 +#: js/personal.js:266 msgid "Decrypting files... Please wait, this can take some time." msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。" -#: js/personal.js:287 +#: js/personal.js:288 msgid "Saving..." msgstr "保存中..." @@ -496,11 +496,11 @@ msgstr "プロフィール写真" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "新規にアップロード" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "ファイルから新規に選択" #: templates/personal.php:93 msgid "Remove image" @@ -508,7 +508,7 @@ msgstr "画像を削除" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。" #: templates/personal.php:97 msgid "Abort" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index b2497ad3499..d3f72518cc7 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -5,13 +5,14 @@ # Translators: # ujuc Gang , 2013 # ujuc Gang , 2013 +# smallsnail , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-29 10:06+0000\n" +"Last-Translator: smallsnail \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +32,11 @@ msgstr "%s 항목을 이딩시키지 못하였음" #: ajax/upload.php:16 ajax/upload.php:45 msgid "Unable to set upload directory." -msgstr "" +msgstr "업로드 디렉터리를 정할수 없습니다" #: ajax/upload.php:22 msgid "Invalid Token" -msgstr "" +msgstr "잘못된 토큰" #: ajax/upload.php:59 msgid "No file was uploaded. Unknown error" @@ -78,23 +79,23 @@ msgstr "저장소가 용량이 충분하지 않습니다." #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "업로드에 실패했습니다. 파일 정보를 가져올수 없습니다." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "업로드에 실패했습니다. 업로드할 파일을 찾을수 없습니다" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "올바르지 않은 디렉터리입니다." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "파일" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "{filename}을 업로드 할수 없습니다. 폴더이거나 0 바이트 파일입니다." #: js/file-upload.js:255 msgid "Not enough space available" @@ -106,7 +107,7 @@ msgstr "업로드가 취소되었습니다." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "서버에서 결과를 가져올수 없습니다." #: js/file-upload.js:446 msgid "" @@ -119,7 +120,7 @@ msgstr "URL을 입력해야 합니다." #: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "유효하지 않은 폴더명입니다. \"Shared\" 이름의 사용은 OwnCloud 가 이미 예약하고 있습니다." #: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" @@ -168,21 +169,21 @@ msgstr "되돌리기" #: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" +msgstr[0] "폴더 %n" #: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" +msgstr[0] "파일 %n 개" #: js/filelist.js:541 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} 그리고 {files}" #: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" +msgstr[0] "%n 개의 파일을 업로드중" #: js/files.js:25 msgid "'.' is an invalid file name." @@ -210,7 +211,7 @@ msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "암호화는 해제되어 있지만, 파일은 아직 암호화 되어 있습니다. 개인 설저에 가셔서 암호를 해제하십시오" #: js/files.js:296 msgid "" @@ -220,7 +221,7 @@ msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간 #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "파일 이동 오류" #: js/files.js:558 templates/index.php:61 msgid "Name" @@ -237,7 +238,7 @@ msgstr "수정됨" #: lib/app.php:73 #, php-format msgid "%s could not be renamed" -msgstr "" +msgstr "%s 의 이름을 변경할수 없습니다" #: lib/helper.php:11 templates/index.php:17 msgid "Upload" diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po index 434e19ca27a..da94ad32110 100644 --- a/l10n/ko/files_sharing.po +++ b/l10n/ko/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# smallsnail , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 10:14+0000\n" +"Last-Translator: smallsnail \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: templates/authenticate.php:4 msgid "The password is wrong. Try again." -msgstr "" +msgstr "비밀번호가 틀립니다. 다시 입력해주세요." #: templates/authenticate.php:7 msgid "Password" @@ -31,27 +32,27 @@ msgstr "제출" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "죄송합니다만 이 링크는 더이상 작동되지 않습니다." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "이유는 다음과 같을 수 있습니다:" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "이 항목은 삭제되었습니다" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "링크가 만료되었습니다" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "공유가 비활성되었습니다" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "더 자세한 설명은 링크를 보내신 분에게 여쭤보십시오" #: templates/public.php:15 #, php-format diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po index 3e48f534a18..4d39e2d9acd 100644 --- a/l10n/ko/files_trashbin.po +++ b/l10n/ko/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# smallsnail , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 07:38+0000\n" +"Last-Translator: smallsnail \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,63 +21,63 @@ msgstr "" #: ajax/delete.php:42 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "%s를 영구적으로 삭제할수 없습니다" #: ajax/undelete.php:42 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "%s를 복원할수 없습니다" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" -msgstr "" +msgstr "복원 작업중" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "오류" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" -msgstr "" +msgstr "영구적으로 파일 삭제하기" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "영원히 삭제" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "이름" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" -msgstr "" +msgstr "삭제됨" -#: js/trash.js:191 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" +msgstr[0] "폴더 %n개" -#: js/trash.js:197 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" +msgstr[0] "파일 %n개 " -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trashbin.php:814 lib/trashbin.php:816 msgid "restored" -msgstr "" +msgstr "복원됨" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "현재 휴지통은 비어있습니다!" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "복원" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "삭제" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "삭제된 파일들" diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po index 19ec188ee6c..1a9375ae400 100644 --- a/l10n/ko/files_versions.po +++ b/l10n/ko/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Shinjo Park , 2013 +# smallsnail , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 10:18+0000\n" +"Last-Translator: smallsnail \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,16 +30,16 @@ msgstr "버전" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "{timestamp} 판의 {file}로 돌리는데 실패했습니다." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "더 많은 버전들..." #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "다른 버전을 사용할수 없습니다" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "복원" diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po index 06627a79781..ca05c5e1330 100644 --- a/l10n/ko/lib.po +++ b/l10n/ko/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 07:46+0000\n" +"Last-Translator: smallsnail \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,53 +19,53 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:239 +#: app.php:237 #, php-format msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다." -#: app.php:250 +#: app.php:248 msgid "No app name specified" msgstr "앱 이름이 지정되지 않았습니다." -#: app.php:361 +#: app.php:352 msgid "Help" msgstr "도움말" -#: app.php:374 +#: app.php:365 msgid "Personal" msgstr "개인" -#: app.php:385 +#: app.php:376 msgid "Settings" msgstr "설정" -#: app.php:397 +#: app.php:388 msgid "Users" msgstr "사용자" -#: app.php:410 +#: app.php:401 msgid "Admin" msgstr "관리자" -#: app.php:839 +#: app.php:832 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "\"%s\" 업그레이드에 실패했습니다." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "개개인의 프로필 사진은 아직은 암호화 되지 않습니다" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "알수없는 파일형식" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "잘못된 그림" #: defaults.php:35 msgid "web services under your control" @@ -96,7 +96,7 @@ msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다." msgid "" "Download the files in smaller chunks, seperately or kindly ask your " "administrator." -msgstr "" +msgstr "작은 조각들 안에 들어있는 파일들을 받고자 하신다면, 나누어서 받으시거나 혹은 시스템 관리자에게 정중하게 물어보십시오" #: installer.php:63 msgid "No source specified when installing app" @@ -166,15 +166,15 @@ msgstr "인증 오류" msgid "Token expired. Please reload page." msgstr "토큰이 만료되었습니다. 페이지를 새로 고치십시오." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "파일" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "텍스트" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "그림" @@ -278,6 +278,11 @@ msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서 msgid "Please double check the installation guides." msgstr "설치 가이드를 다시 한 번 확인하십시오." +#: tags.php:194 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "분류 \"%s\"을(를) 찾을 수 없습니다." + #: template/functions.php:96 msgid "seconds ago" msgstr "초 전" @@ -325,8 +330,3 @@ msgstr "년 전" #: template.php:297 msgid "Caused by:" msgstr "원인: " - -#: vcategories.php:188 vcategories.php:249 -#, php-format -msgid "Could not find category \"%s\"" -msgstr "분류 \"%s\"을(를) 찾을 수 없습니다." diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index f340c7a46db..4a22a7c9482 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/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: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-29 07:58+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,23 +277,23 @@ msgstr "Klaida įkeliant žinutės ruošinį: {error}" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{count} failas konfliktuoja" +msgstr[1] "{count} failai konfliktuoja" +msgstr[2] "{count} failų konfliktų" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Vienas failo konfliktas" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" -msgstr "" +msgstr "Kuriuos failus norite laikyti?" #: js/oc-dialogs.js:368 msgid "" "If you select both versions, the copied file will have a number added to its" " name." -msgstr "" +msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime." #: js/oc-dialogs.js:376 msgid "Cancel" @@ -301,19 +301,19 @@ msgstr "Atšaukti" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Tęsti" #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(visi pažymėti)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} pažymėtų)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" -msgstr "" +msgstr "Klaida įkeliant esančių failų ruošinį" #: 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 @@ -324,7 +324,7 @@ msgstr "Objekto tipas nenurodytas." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Klaida" @@ -344,7 +344,7 @@ msgstr "Dalinamasi" msgid "Share" msgstr "Dalintis" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Klaida, dalijimosi metu" @@ -444,23 +444,23 @@ msgstr "ištrinti" msgid "share" msgstr "dalintis" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Apsaugota slaptažodžiu" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Klaida nuimant galiojimo laiką" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Klaida nustatant galiojimo laiką" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Siunčiama..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "Laiškas išsiųstas" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index da69b0a419b..829d61188a3 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-29 08:46+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,23 +78,23 @@ msgstr "Nepakanka vietos serveryje" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neteisingas aplankas" -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Failai" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio" #: js/file-upload.js:255 msgid "Not enough space available" @@ -106,7 +106,7 @@ msgstr "Įkėlimas atšauktas." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Nepavyko gauti rezultato iš serverio." #: js/file-upload.js:446 msgid "" @@ -226,7 +226,7 @@ msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunč #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Klaida perkeliant failą" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 14592409dd9..ff719fb19fe 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/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: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:17-0400\n" +"PO-Revision-Date: 2013-09-29 08:49+0000\n" +"Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,42 +90,42 @@ msgstr "Nepavyko atnaujinti programos." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Neteisingas slaptažodis" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nepateiktas naudotojas" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas." #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Nepavyksta pakeisti slaptažodžio" #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Atnaujinti iki {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Išjungti" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Įjungti" @@ -133,43 +133,43 @@ msgstr "Įjungti" msgid "Please wait...." msgstr "Prašome palaukti..." -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Klaida išjungiant programą" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Klaida įjungiant programą" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Atnaujinama..." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Įvyko klaida atnaujinant programą" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Klaida" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Atnaujinti" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Atnaujinta" -#: js/personal.js:220 +#: js/personal.js:221 msgid "Select a profile picture" msgstr "Pažymėkite profilio paveikslėlį" -#: js/personal.js:265 +#: js/personal.js:266 msgid "Decrypting files... Please wait, this can take some time." msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti." -#: js/personal.js:287 +#: js/personal.js:288 msgid "Saving..." msgstr "Saugoma..." diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 3d7aae83bae..d3f781b0e4d 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-22 12:55-0400\n" -"PO-Revision-Date: 2013-09-20 15:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 12:27+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,11 +98,11 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Nieznany typ pliku" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Nieprawidłowe zdjęcie" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -275,13 +275,13 @@ msgstr "" #: js/oc-dialogs.js:347 msgid "{count} file conflict" msgid_plural "{count} file conflicts" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{count} konfliktów plików" +msgstr[1] "{count} konfliktów plików" +msgstr[2] "{count} konfliktów plików" #: js/oc-dialogs.js:361 msgid "One file conflict" -msgstr "" +msgstr "Konflikt pliku" #: js/oc-dialogs.js:367 msgid "Which files do you want to keep?" @@ -299,15 +299,15 @@ msgstr "Anuluj" #: js/oc-dialogs.js:386 msgid "Continue" -msgstr "" +msgstr "Kontynuuj " #: js/oc-dialogs.js:433 js/oc-dialogs.js:446 msgid "(all selected)" -msgstr "" +msgstr "(wszystkie zaznaczone)" #: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "({count} selected)" -msgstr "" +msgstr "({count} zaznaczonych)" #: js/oc-dialogs.js:457 msgid "Error loading file exists template" @@ -322,7 +322,7 @@ msgstr "Nie określono typu obiektu." #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 -#: js/share.js:645 js/share.js:657 +#: js/share.js:656 js/share.js:668 msgid "Error" msgstr "Błąd" @@ -342,7 +342,7 @@ msgstr "Udostępniono" msgid "Share" msgstr "Udostępnij" -#: js/share.js:131 js/share.js:685 +#: js/share.js:131 js/share.js:696 msgid "Error while sharing" msgstr "Błąd podczas współdzielenia" @@ -442,23 +442,23 @@ msgstr "usuń" msgid "share" msgstr "współdziel" -#: js/share.js:400 js/share.js:632 +#: js/share.js:400 js/share.js:643 msgid "Password protected" msgstr "Zabezpieczone hasłem" -#: js/share.js:645 +#: js/share.js:656 msgid "Error unsetting expiration date" msgstr "Błąd podczas usuwania daty wygaśnięcia" -#: js/share.js:657 +#: js/share.js:668 msgid "Error setting expiration date" msgstr "Błąd podczas ustawiania daty wygaśnięcia" -#: js/share.js:672 +#: js/share.js:683 msgid "Sending ..." msgstr "Wysyłanie..." -#: js/share.js:683 +#: js/share.js:694 msgid "Email sent" msgstr "E-mail wysłany" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index b94335006bb..a88ee97ad7e 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/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: 2013-09-20 10:44-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:14-0400\n" +"PO-Revision-Date: 2013-09-30 12:24+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,23 +79,23 @@ msgstr "Za mało dostępnego miejsca" #: ajax/upload.php:120 ajax/upload.php:143 msgid "Upload failed. Could not get file info." -msgstr "" +msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku." #: ajax/upload.php:136 msgid "Upload failed. Could not find uploaded file" -msgstr "" +msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku" #: ajax/upload.php:160 msgid "Invalid directory." msgstr "Zła ścieżka." -#: appinfo/app.php:12 +#: appinfo/app.php:11 msgid "Files" msgstr "Pliki" #: js/file-upload.js:244 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" -msgstr "" +msgstr "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów" #: js/file-upload.js:255 msgid "Not enough space available" @@ -107,7 +107,7 @@ msgstr "Wczytywanie anulowane." #: js/file-upload.js:356 msgid "Could not get result from server." -msgstr "" +msgstr "Nie można uzyskać wyniku z serwera." #: js/file-upload.js:446 msgid "" @@ -227,7 +227,7 @@ msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pl #: js/files.js:507 js/files.js:545 msgid "Error moving file" -msgstr "" +msgstr "Błąd prz przenoszeniu pliku" #: js/files.js:558 templates/index.php:61 msgid "Name" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index beae34e5803..9e29c51c5a9 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" +"PO-Revision-Date: 2013-09-30 12:26+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,53 +18,53 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:239 +#: app.php:237 #, php-format msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud." -#: app.php:250 +#: app.php:248 msgid "No app name specified" msgstr "Nie określono nazwy aplikacji" -#: app.php:361 +#: app.php:352 msgid "Help" msgstr "Pomoc" -#: app.php:374 +#: app.php:365 msgid "Personal" msgstr "Osobiste" -#: app.php:385 +#: app.php:376 msgid "Settings" msgstr "Ustawienia" -#: app.php:397 +#: app.php:388 msgid "Users" msgstr "Użytkownicy" -#: app.php:410 +#: app.php:401 msgid "Admin" msgstr "Administrator" -#: app.php:839 +#: app.php:832 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Błąd przy aktualizacji \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Nieznany typ pliku" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Błędne zdjęcie" #: defaults.php:35 msgid "web services under your control" @@ -165,15 +165,15 @@ msgstr "Błąd uwierzytelniania" msgid "Token expired. Please reload page." msgstr "Token wygasł. Proszę ponownie załadować stronę." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Pliki" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Połączenie tekstowe" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Obrazy" @@ -277,6 +277,11 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl msgid "Please double check the installation guides." msgstr "Sprawdź ponownie przewodniki instalacji." +#: tags.php:194 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "Nie można odnaleźć kategorii \"%s\"" + #: template/functions.php:96 msgid "seconds ago" msgstr "sekund temu" @@ -332,8 +337,3 @@ msgstr "lat temu" #: template.php:297 msgid "Caused by:" msgstr "Spowodowane przez:" - -#: vcategories.php:188 vcategories.php:249 -#, php-format -msgid "Could not find category \"%s\"" -msgstr "Nie można odnaleźć kategorii \"%s\"" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 5b5e435ef1c..830b2045a3f 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-20 10:45-0400\n" -"PO-Revision-Date: 2013-09-20 14:45+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-30 10:17-0400\n" +"PO-Revision-Date: 2013-09-30 12:15+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,7 +88,7 @@ msgstr "Nie można uaktualnić aplikacji." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Złe hasło" #: changepassword/controller.php:42 msgid "No user supplied" @@ -113,17 +113,17 @@ msgstr "" #: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Nie można zmienić hasła" #: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizacja do {appversion}" -#: js/apps.js:49 js/apps.js:82 js/apps.js:108 +#: js/apps.js:49 js/apps.js:82 js/apps.js:110 msgid "Disable" msgstr "Wyłącz" -#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 +#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119 msgid "Enable" msgstr "Włącz" @@ -131,43 +131,43 @@ msgstr "Włącz" msgid "Please wait...." msgstr "Proszę czekać..." -#: js/apps.js:79 js/apps.js:80 js/apps.js:100 +#: js/apps.js:79 js/apps.js:80 js/apps.js:101 msgid "Error while disabling app" msgstr "Błąd podczas wyłączania aplikacji" -#: js/apps.js:99 js/apps.js:112 js/apps.js:113 +#: js/apps.js:100 js/apps.js:114 js/apps.js:115 msgid "Error while enabling app" msgstr "Błąd podczas włączania aplikacji" -#: js/apps.js:123 +#: js/apps.js:125 msgid "Updating...." msgstr "Aktualizacja w toku..." -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error while updating app" msgstr "Błąd podczas aktualizacji aplikacji" -#: js/apps.js:126 +#: js/apps.js:128 msgid "Error" msgstr "Błąd" -#: js/apps.js:127 templates/apps.php:43 +#: js/apps.js:129 templates/apps.php:43 msgid "Update" msgstr "Aktualizuj" -#: js/apps.js:130 +#: js/apps.js:132 msgid "Updated" msgstr "Zaktualizowano" -#: js/personal.js:220 +#: js/personal.js:221 msgid "Select a profile picture" -msgstr "" +msgstr "Wybierz zdjęcie profilu" -#: js/personal.js:265 +#: js/personal.js:266 msgid "Decrypting files... Please wait, this can take some time." msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas." -#: js/personal.js:287 +#: js/personal.js:288 msgid "Saving..." msgstr "Zapisywanie..." @@ -495,15 +495,15 @@ msgstr "Zdjęcie profilu" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Wczytaj nowe" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Wybierz nowe z plików" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Usuń zdjęcie" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -515,7 +515,7 @@ msgstr "Anuluj" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Wybierz zdjęcie profilu" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index afb3a410c4c..687b168209c 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 1e72820c523..5a5cf056beb 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:14-0400\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 aea2b2282e1..312f7f29bb0 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:15-0400\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 ad32cfb2fcf..0ec2c070912 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 e9a596f361c..77c296c9a7c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 044fb375dfc..b379edf9e93 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 a61952105bd..4d7bff6e8b6 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 2f54bdc2335..cdaf465ab30 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,38 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: app.php:239 +#: app.php:237 #, php-format msgid "" "App \"%s\" can't be installed because it is not compatible with this version " "of ownCloud." msgstr "" -#: app.php:250 +#: app.php:248 msgid "No app name specified" msgstr "" -#: app.php:361 +#: app.php:352 msgid "Help" msgstr "" -#: app.php:374 +#: app.php:365 msgid "Personal" msgstr "" -#: app.php:385 +#: app.php:376 msgid "Settings" msgstr "" -#: app.php:397 +#: app.php:388 msgid "Users" msgstr "" -#: app.php:410 +#: app.php:401 msgid "Admin" msgstr "" -#: app.php:839 +#: app.php:832 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" @@ -277,6 +277,11 @@ msgstr "" msgid "Please double check the installation guides." msgstr "" +#: tags.php:194 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" + #: template/functions.php:96 msgid "seconds ago" msgstr "" @@ -328,8 +333,3 @@ msgstr "" #: template.php:297 msgid "Caused by:" msgstr "" - -#: vcategories.php:188 vcategories.php:249 -#, php-format -msgid "Could not find category \"%s\"" -msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index a669dad822d..af2b7236802 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:17-0400\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 0848d993537..ca738710f5c 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 ec5a60a6ecb..d3a899a1fe5 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-29 00:02-0400\n" +"POT-Creation-Date: 2013-09-30 10:16-0400\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 7ec7621a655..e944291caee 100644 --- a/lib/l10n/hu_HU.php +++ b/lib/l10n/hu_HU.php @@ -1,11 +1,14 @@ "Nincs az alkalmazás név megadva.", "Help" => "Súgó", "Personal" => "Személyes", "Settings" => "Beállítások", "Users" => "Felhasználók", "Admin" => "Adminsztráció", "Failed to upgrade \"%s\"." => "Sikertelen Frissítés \"%s\".", +"Unknown filetype" => "Ismeretlen file tipús", +"Invalid image" => "Hibás kép", "web services under your control" => "webszolgáltatások saját kézben", "cannot open \"%s\"" => "nem sikerült megnyitni \"%s\"", "ZIP download is turned off." => "A ZIP-letöltés nincs engedélyezve.", @@ -13,6 +16,10 @@ $TRANSLATIONS = array( "Back to Files" => "Vissza a Fájlokhoz", "Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.", +"App does not provide an info.xml file" => "Az alkalmazás nem szolgáltatott info.xml file-t", +"App can't be installed because it is not compatible with this version of ownCloud" => "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával.", +"App directory already exists" => "Az alkalmazás mappája már létezik", +"Can't create app folder. Please fix permissions. %s" => "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s", "Application is not enabled" => "Az alkalmazás nincs engedélyezve", "Authentication error" => "Azonosítási hiba", "Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.", @@ -39,6 +46,7 @@ $TRANSLATIONS = array( "Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.", "Please double check the installation guides." => "Kérjük tüzetesen tanulmányozza át a telepítési útmutatót.", +"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"", "seconds ago" => "pár másodperce", "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), @@ -49,7 +57,6 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "tavaly", "years ago" => "több éve", -"Caused by:" => "Okozta:", -"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"" +"Caused by:" => "Okozta:" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php index eec5be65abd..3ef39fefa60 100644 --- a/lib/l10n/ko.php +++ b/lib/l10n/ko.php @@ -8,12 +8,16 @@ $TRANSLATIONS = array( "Users" => "사용자", "Admin" => "관리자", "Failed to upgrade \"%s\"." => "\"%s\" 업그레이드에 실패했습니다.", +"Custom profile pictures don't work with encryption yet" => "개개인의 프로필 사진은 아직은 암호화 되지 않습니다", +"Unknown filetype" => "알수없는 파일형식", +"Invalid image" => "잘못된 그림", "web services under your control" => "내가 관리하는 웹 서비스", "cannot open \"%s\"" => "\"%s\"을(를) 열 수 없습니다.", "ZIP download is turned off." => "ZIP 다운로드가 비활성화되었습니다.", "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.", "Back to Files" => "파일로 돌아가기", "Selected files too large to generate zip file." => "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다.", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "작은 조각들 안에 들어있는 파일들을 받고자 하신다면, 나누어서 받으시거나 혹은 시스템 관리자에게 정중하게 물어보십시오", "No source specified when installing app" => "앱을 설치할 때 소스가 지정되지 않았습니다.", "No href specified when installing app from http" => "http에서 앱을 설치할 대 href가 지정되지 않았습니다.", "No path specified when installing app from local file" => "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.", @@ -52,6 +56,7 @@ $TRANSLATIONS = array( "Set an admin password." => "관리자 비밀번호 설정", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.", "Please double check the installation guides." => "설치 가이드를 다시 한 번 확인하십시오.", +"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다.", "seconds ago" => "초 전", "_%n minute ago_::_%n minutes ago_" => array("%n분 전 "), "_%n hour ago_::_%n hours ago_" => array("%n시간 전 "), @@ -62,7 +67,6 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n달 전 "), "last year" => "작년", "years ago" => "년 전", -"Caused by:" => "원인: ", -"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다." +"Caused by:" => "원인: " ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index 4acd735d692..270559b4e50 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Użytkownicy", "Admin" => "Administrator", "Failed to upgrade \"%s\"." => "Błąd przy aktualizacji \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze", +"Unknown filetype" => "Nieznany typ pliku", +"Invalid image" => "Błędne zdjęcie", "web services under your control" => "Kontrolowane serwisy", "cannot open \"%s\"" => "Nie można otworzyć \"%s\"", "ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.", @@ -53,6 +56,7 @@ $TRANSLATIONS = array( "Set an admin password." => "Ustaw hasło administratora.", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the installation guides." => "Sprawdź ponownie przewodniki instalacji.", +"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\"", "seconds ago" => "sekund temu", "_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"), "_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"), @@ -63,7 +67,6 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "last year" => "w zeszłym roku", "years ago" => "lat temu", -"Caused by:" => "Spowodowane przez:", -"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\"" +"Caused by:" => "Spowodowane przez:" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index f31826c149f..cba844e7818 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -16,15 +16,25 @@ $TRANSLATIONS = array( "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", "Couldn't update app." => "A program frissítése nem sikerült.", +"Wrong password" => "Hibás jelszó", +"No user supplied" => "Nincs felhasználó által mellékelve", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik.", +"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.", +"Unable to change password" => "Nem sikerült megváltoztatni a jelszót", "Update to {appversion}" => "Frissítés erre a verzióra: {appversion}", "Disable" => "Letiltás", "Enable" => "engedélyezve", "Please wait...." => "Kérem várjon...", +"Error while disabling app" => "Hiba az alkalmazás kikapcsolása közben", +"Error while enabling app" => "Hiba az alalmazás engedélyezése közben", "Updating...." => "Frissítés folyamatban...", "Error while updating app" => "Hiba történt a programfrissítés közben", "Error" => "Hiba", "Update" => "Frissítés", "Updated" => "Frissítve", +"Select a profile picture" => "Válassz profil képet", +"Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...", "Saving..." => "Mentés...", "deleted" => "törölve", "undo" => "visszavonás", @@ -98,11 +108,20 @@ $TRANSLATIONS = array( "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!", "Profile picture" => "Profilkép", +"Upload new" => "Új feltöltése", +"Select new from Files" => "Új kiválasztása Fileokból", +"Remove image" => "Kép eltávolítása", +"Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható", +"Abort" => "Megszakítás", +"Choose as profile image" => "Válassz profil képet", "Language" => "Nyelv", "Help translate" => "Segítsen a fordításban!", "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Ezt a címet használja, ha WebDAV-on keresztül szeretné elérni az állományait", "Encryption" => "Titkosítás", +"The encryption app is no longer enabled, decrypt all your file" => "A titkosító alkalmzás a továbbiakban nincs engedélyezve, kititkosítja az összes fileodat", +"Log-in password" => "Bejelentkezési jelszó", +"Decrypt all Files" => "Kititkosítja az összes file-t", "Login Name" => "Bejelentkezési név", "Create" => "Létrehozás", "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 12784e3f537..bfaa9827b21 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "ユーザをグループ %s に追加できません", "Unable to remove user from group %s" => "ユーザをグループ %s から削除できません", "Couldn't update app." => "アプリを更新出来ませんでした。", +"Wrong password" => "無効なパスワード", +"No user supplied" => "ユーザが指定されていません", +"Please provide an admin recovery password, otherwise all user data will be lost" => "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。", +"Wrong admin recovery password. Please check the password and try again." => "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。", +"Unable to change password" => "パスワードを変更できません", "Update to {appversion}" => "{appversion} に更新", "Disable" => "無効", "Enable" => "有効化", @@ -102,7 +108,10 @@ $TRANSLATIONS = array( "Your email address" => "あなたのメールアドレス", "Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です", "Profile picture" => "プロフィール写真", +"Upload new" => "新規にアップロード", +"Select new from Files" => "ファイルから新規に選択", "Remove image" => "画像を削除", +"Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。", "Abort" => "中止", "Choose as profile image" => "プロファイル画像として選択", "Language" => "言語", diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index a23d21ed7f7..df0247fc27e 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s", "Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s", "Couldn't update app." => "Nepavyko atnaujinti programos.", +"Wrong password" => "Neteisingas slaptažodis", +"No user supplied" => "Nepateiktas naudotojas", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti", +"Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.", +"Unable to change password" => "Nepavyksta pakeisti slaptažodžio", "Update to {appversion}" => "Atnaujinti iki {appversion}", "Disable" => "Išjungti", "Enable" => "Įjungti", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index d07d1f7a4d2..6cce72df4b6 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s", "Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s", "Couldn't update app." => "Nie można uaktualnić aplikacji.", +"Wrong password" => "Złe hasło", +"Unable to change password" => "Nie można zmienić hasła", "Update to {appversion}" => "Aktualizacja do {appversion}", "Disable" => "Wyłącz", "Enable" => "Włącz", @@ -27,6 +29,7 @@ $TRANSLATIONS = array( "Error" => "Błąd", "Update" => "Aktualizuj", "Updated" => "Zaktualizowano", +"Select a profile picture" => "Wybierz zdjęcie profilu", "Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.", "Saving..." => "Zapisywanie...", "deleted" => "usunięto", @@ -101,7 +104,11 @@ $TRANSLATIONS = array( "Your email address" => "Twój adres e-mail", "Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła", "Profile picture" => "Zdjęcie profilu", +"Upload new" => "Wczytaj nowe", +"Select new from Files" => "Wybierz nowe z plików", +"Remove image" => "Usuń zdjęcie", "Abort" => "Anuluj", +"Choose as profile image" => "Wybierz zdjęcie profilu", "Language" => "Język", "Help translate" => "Pomóż w tłumaczeniu", "WebDAV" => "WebDAV", -- cgit v1.2.3