From 0dbf1d02600ef4075ceffe9c62c1ed32cc24592f Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 24 Dec 2012 13:45:52 -0500 Subject: [PATCH 001/353] Show status icons for mount points in external storage UI --- apps/files_external/ajax/addMountPoint.php | 5 +- apps/files_external/css/settings.css | 5 +- apps/files_external/img/error.png | Bin 0 -> 533 bytes apps/files_external/img/success.png | Bin 0 -> 545 bytes apps/files_external/img/waiting.png | Bin 0 -> 512 bytes apps/files_external/js/settings.js | 21 +++++- apps/files_external/lib/amazons3.php | 14 +++- apps/files_external/lib/config.php | 37 ++++++++-- apps/files_external/lib/dropbox.php | 5 +- apps/files_external/lib/ftp.php | 41 ++++++----- apps/files_external/lib/google.php | 4 ++ apps/files_external/lib/smb.php | 50 +++++++------ apps/files_external/lib/swift.php | 45 ++++++------ apps/files_external/lib/webdav.php | 77 ++++++++++++--------- apps/files_external/templates/settings.php | 6 ++ 15 files changed, 203 insertions(+), 107 deletions(-) create mode 100644 apps/files_external/img/error.png create mode 100644 apps/files_external/img/success.png create mode 100644 apps/files_external/img/waiting.png diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php index 4cd8871b310..fed2ddfcf3d 100644 --- a/apps/files_external/ajax/addMountPoint.php +++ b/apps/files_external/ajax/addMountPoint.php @@ -10,9 +10,10 @@ if ($_POST['isPersonal'] == 'true') { OCP\JSON::checkAdminUser(); $isPersonal = false; } -OC_Mount_Config::addMountPoint($_POST['mountPoint'], +$status = OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['class'], $_POST['classOptions'], $_POST['mountType'], $_POST['applicable'], - $isPersonal); \ No newline at end of file + $isPersonal); +OCP\JSON::success(array('data' => array('message' => $status))); \ No newline at end of file diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index ca4b1c3ba89..94b453793b1 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -1,4 +1,7 @@ -.error { color: #FF3B3B; } +td.status>span { display:inline-block; height:16px; width:16px; } +span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; } +span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; } +span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; } td.mountPoint, td.backend { width:10em; } td.remove>img { visibility:hidden; padding-top:0.8em; } tr:hover>td.remove>img { visibility:visible; cursor:pointer; } diff --git a/apps/files_external/img/error.png b/apps/files_external/img/error.png new file mode 100644 index 0000000000000000000000000000000000000000..e8cf45e7a41e358da5d573dc48edf966b9d8d3cb GIT binary patch literal 533 zcmV+w0_y#VP)WFU8GbZ8()Nlj2>E@cM*00DVPL_t(I%XO2zP9s4O zguh~X5z9j$Ik*!Eu?ZcT0EtI%c=tr!kViP_BtS$CaeUzg7B7Jj7!|?H{uwjLtV-3> zRn@&>@BFDwr{D!*hBZL|-hfuX?akZEddSzfxLzWDb$|;+?nzd2^ZxSt%L9Lp>wCjo z7RIR5cLWLBC<71IZ`&(?BY?Z(dKqS3StOYXNP-X~AP`{_Kr)0izpLscfF7%Q3VJGf z4;&5s?4Qd>umES9`pRhSHdlY8_f9u^WUw@(B~!+tc1@Q1y$m+`aROHyyL9&FY2k_$#&k$!-Ejh_DEk1(FGggfnJm+z@tivD>aYVgKXg9y8ycq@@yO zj~gC-e!TXp4De(3dX=EbtDDs%pekKkJfLZd55>!KI++RWFU8GbZ8()Nlj2>E@cM*00D(bL_t(I%Vm>6irYXC zMc-GKURaaHl z|G!$?Jl#{fHSB>Muqo~f_yios$A9NKUbS)e)E>a!C1KY)u0x0M@$JXE0^QH{#imD# zvraQ0=N0ifetUZWXaKtB_CTUnfRbLN5O!H_ zxDv+Zb11Z5S`|z+EUcWIojJx*Nfy99NbGK@Dk&8MTF7!`i(L@f$gV<+BxKKMTz+KN z)e&rhw6v)i-3sYyZ~hvL2|^d((}aJKQFFVugR?-@rBQHVk|~O?&00o6S-!}&lBT^= zqokuk5JCwQLXiU$MfU_W!b!#FDfZZ0zm8`TLq0X1L@C6Skc?VT^3p+Qxc1|D2KeFE z-HV`Ksa3|eqNk9m*X#Ybj55IWetaNlAj;^*GPWFU8GbZ8()Nlj2>E@cM*00Cr4L_t(I%Wab}PQySD zMc?=OBI&q6DAPm=ir@@s5Vr7fKnVhgoB>b>3PnmdMUL_*c5Saswz6mc{Mq^QM~u$q z;bDqdA!fiNg-^f{*j7#Ro8vV~UISGZ@E8$cRnye}2%a7vKLrb?s4R>JnFbU?`@81; zsv~&WJgqHP@(A2L!5F2lNMd<&Th+B*U!JF!p9pZ4GAu2?%6f`Smt_&k754co1hHC2 zuMB9jDnk)wWR>%D+MbovuzKZUU{;0@CXsniG{cPKwy`=fCuI=|IP>yea?!V#E~J)= zGK6pfE(Vp{&LD!-GCR&Cjv*SX3?UqCE+jg^`j@EZ8+js~V_Af-1*-nuS-+{aoJ)`o zY%73|xA!%;iYRscJGE;IrT^U0*EctHH@V$z7p?5^AamEdz1c69%d3CO^!2r0+f*dm z'); $(tr).find('.backend').data('class', backendClass); var configurations = $(this).data('configurations'); var td = $(tr).find('td.configuration'); diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 235ade06db6..c1b2e889bba 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -30,11 +30,19 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common { private static $tempFiles = array(); - // TODO options: storage class, encryption server side, encrypt before upload? + // TODO Update to new AWS SDK public function __construct($params) { - $this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret'])); - $this->bucket = $params['bucket']; + if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) { + $this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret'])); + $this->bucket = $params['bucket']; + $test = $this->s3->get_canonical_user_id(); + if (!isset($test['id']) || $test['id'] == '') { + throw new Exception(); + } + } else { + throw new Exception(); + } } private function getObject($path) { diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 1be544fbc07..99d31c5aa2d 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -131,7 +131,9 @@ class OC_Mount_Config { 'class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], - 'applicable' => array('groups' => array($group), 'users' => array())); + 'applicable' => array('groups' => array($group), 'users' => array()), + 'status' => self::getBackendStatus($mount['class'], $mount['options']) + ); } } } @@ -146,10 +148,13 @@ class OC_Mount_Config { $system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user)); } else { - $system[$mountPoint] = array('class' => $mount['class'], + $system[$mountPoint] = array( + 'class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], - 'applicable' => array('groups' => array(), 'users' => array($user))); + 'applicable' => array('groups' => array(), 'users' => array($user)), + 'status' => self::getBackendStatus($mount['class'], $mount['options']) + ); } } } @@ -170,14 +175,32 @@ class OC_Mount_Config { if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) { foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) { // Remove '/uid/files/' from mount point - $personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], - 'backend' => $backends[$mount['class']]['backend'], - 'configuration' => $mount['options']); + $personal[substr($mountPoint, strlen($uid) + 8)] = array( + 'class' => $mount['class'], + 'backend' => $backends[$mount['class']]['backend'], + 'configuration' => $mount['options'], + 'status' => self::getBackendStatus($mount['class'], $mount['options']) + ); } } return $personal; } + private static function getBackendStatus($class, $options) { + foreach ($options as &$option) { + $option = str_replace('$user', OCP\User::getUser(), $option); + } + if (class_exists($class)) { + try { + new $class($options); + return true; + } catch (Exception $exception) { + return false; + } + } + return false; + } + /** * Add directory for mount point to the filesystem * @param OC_Fileview instance $view @@ -259,7 +282,7 @@ class OC_Mount_Config { $mountPoints[$mountType] = $mount; } self::writeData($isPersonal, $mountPoints); - return true; + return self::getBackendStatus($class, $classOptions); } /** diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 33ca14cab15..a4f3f678344 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -41,7 +41,10 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { $oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth->setToken($params['token'], $params['token_secret']); $this->dropbox = new Dropbox_API($oauth, 'dropbox'); - $this->mkdir(''); + $test = $this->stat(''); + if (!$test) { + throw new Exception('Creating OC_Filestorage_Dropbox storage failed'); + } } else { throw new Exception('Creating OC_Filestorage_Dropbox storage failed'); } diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index e796ae446bf..ac487156c18 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -16,26 +16,35 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ private static $tempFiles=array(); public function __construct($params) { - $this->host=$params['host']; - $this->user=$params['user']; - $this->password=$params['password']; - if (isset($params['secure'])) { - if (is_string($params['secure'])) { - $this->secure = ($params['secure'] === 'true'); + if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { + $this->host=$params['host']; + $this->user=$params['user']; + $this->password=$params['password']; + if (isset($params['secure'])) { + if (is_string($params['secure'])) { + $this->secure = ($params['secure'] === 'true'); + } else { + $this->secure = (bool)$params['secure']; + } } else { - $this->secure = (bool)$params['secure']; + $this->secure = false; + } + $this->root=isset($params['root'])?$params['root']:'/'; + if ( ! $this->root || $this->root[0]!='/') { + $this->root='/'.$this->root; + } + $test = $this->stat(''); + if (!$test) { + throw new Exception(); + } + //create the root folder if necesary + if ( ! $this->is_dir('')) { + $this->mkdir(''); } } else { - $this->secure = false; - } - $this->root=isset($params['root'])?$params['root']:'/'; - if ( ! $this->root || $this->root[0]!='/') { - $this->root='/'.$this->root; - } - //create the root folder if necesary - if ( ! $this->is_dir('')) { - $this->mkdir(''); + throw new Exception(); } + } /** diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index c836a5a07c0..19772d4d37f 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -42,6 +42,10 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { $this->oauth_token = new OAuthToken($params['token'], $params['token_secret']); $this->sig_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->entries = array(); + $test = $this->free_space(''); + if (!$test) { + throw new Exception(); + } } else { throw new Exception('Creating OC_Filestorage_Google storage failed'); } diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 071a9cd5f95..97454b46015 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -16,28 +16,36 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ private $share; public function __construct($params) { - $this->host=$params['host']; - $this->user=$params['user']; - $this->password=$params['password']; - $this->share=$params['share']; - $this->root=isset($params['root'])?$params['root']:'/'; - if ( ! $this->root || $this->root[0]!='/') { - $this->root='/'.$this->root; - } - if (substr($this->root, -1, 1)!='/') { - $this->root.='/'; - } - if ( ! $this->share || $this->share[0]!='/') { - $this->share='/'.$this->share; - } - if (substr($this->share, -1, 1)=='/') { - $this->share=substr($this->share, 0, -1); - } - - //create the root folder if necesary - if ( ! $this->is_dir('')) { - $this->mkdir(''); + if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) { + $this->host=$params['host']; + $this->user=$params['user']; + $this->password=$params['password']; + $this->share=$params['share']; + $this->root=isset($params['root'])?$params['root']:'/'; + if ( ! $this->root || $this->root[0]!='/') { + $this->root='/'.$this->root; + } + if (substr($this->root, -1, 1)!='/') { + $this->root.='/'; + } + if ( ! $this->share || $this->share[0]!='/') { + $this->share='/'.$this->share; + } + if (substr($this->share, -1, 1)=='/') { + $this->share=substr($this->share, 0, -1); + } + $test = $this->stat(''); + if (!$test) { + throw new Exception(); + } + //create the root folder if necesary + if ( ! $this->is_dir('')) { + $this->mkdir(''); + } + } else { + throw new Exception(); } + } public function constructUrl($path) { diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index a071dfdbb03..e2add2c9873 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -267,32 +267,37 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ } public function __construct($params) { - $this->token=$params['token']; - $this->host=$params['host']; - $this->user=$params['user']; - $this->root=isset($params['root'])?$params['root']:'/'; - if (isset($params['secure'])) { - if (is_string($params['secure'])) { - $this->secure = ($params['secure'] === 'true'); + if (isset($params['token']) && isset($params['host']) && isset($params['user'])) { + $this->token=$params['token']; + $this->host=$params['host']; + $this->user=$params['user']; + $this->root=isset($params['root'])?$params['root']:'/'; + if (isset($params['secure'])) { + if (is_string($params['secure'])) { + $this->secure = ($params['secure'] === 'true'); + } else { + $this->secure = (bool)$params['secure']; + } } else { - $this->secure = (bool)$params['secure']; + $this->secure = false; } - } else { - $this->secure = false; - } - if ( ! $this->root || $this->root[0]!='/') { - $this->root='/'.$this->root; - } - $this->auth = new CF_Authentication($this->user, $this->token, null, $this->host); - $this->auth->authenticate(); + if ( ! $this->root || $this->root[0]!='/') { + $this->root='/'.$this->root; + } + $this->auth = new CF_Authentication($this->user, $this->token, null, $this->host); + $this->auth->authenticate(); - $this->conn = new CF_Connection($this->auth); + $this->conn = new CF_Connection($this->auth); - if ( ! $this->containerExists('/')) { - $this->rootContainer=$this->createContainer('/'); + if ( ! $this->containerExists('/')) { + $this->rootContainer=$this->createContainer('/'); + } else { + $this->rootContainer=$this->getContainer('/'); + } } else { - $this->rootContainer=$this->getContainer('/'); + throw new Exception(); } + } diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 68aca228bc5..cfe073a1f1c 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -20,47 +20,56 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ private static $tempFiles=array(); public function __construct($params) { - $host = $params['host']; - //remove leading http[s], will be generated in createBaseUri() - if (substr($host, 0, 8) == "https://") $host = substr($host, 8); - else if (substr($host, 0, 7) == "http://") $host = substr($host, 7); - $this->host=$host; - $this->user=$params['user']; - $this->password=$params['password']; - if (isset($params['secure'])) { - if (is_string($params['secure'])) { - $this->secure = ($params['secure'] === 'true'); + if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { + $host = $params['host']; + //remove leading http[s], will be generated in createBaseUri() + if (substr($host, 0, 8) == "https://") $host = substr($host, 8); + else if (substr($host, 0, 7) == "http://") $host = substr($host, 7); + $this->host=$host; + $this->user=$params['user']; + $this->password=$params['password']; + if (isset($params['secure'])) { + if (is_string($params['secure'])) { + $this->secure = ($params['secure'] === 'true'); + } else { + $this->secure = (bool)$params['secure']; + } } else { - $this->secure = (bool)$params['secure']; + $this->secure = false; + } + $this->root=isset($params['root'])?$params['root']:'/'; + if ( ! $this->root || $this->root[0]!='/') { + $this->root='/'.$this->root; + } + if (substr($this->root, -1, 1)!='/') { + $this->root.='/'; } - } else { - $this->secure = false; - } - $this->root=isset($params['root'])?$params['root']:'/'; - if ( ! $this->root || $this->root[0]!='/') { - $this->root='/'.$this->root; - } - if (substr($this->root, -1, 1)!='/') { - $this->root.='/'; - } - $settings = array( - 'baseUri' => $this->createBaseUri(), - 'userName' => $this->user, - 'password' => $this->password, - ); + $settings = array( + 'baseUri' => $this->createBaseUri(), + 'userName' => $this->user, + 'password' => $this->password, + ); - $this->client = new OC_Connector_Sabre_Client($settings); + $this->client = new OC_Connector_Sabre_Client($settings); - $caview = \OCP\Files::getStorage('files_external'); - if ($caview) { - $certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt'; - if (file_exists($certPath)) { - $this->client->addTrustedCertificates($certPath); + $caview = \OCP\Files::getStorage('files_external'); + if ($caview) { + $certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt'; + if (file_exists($certPath)) { + $this->client->addTrustedCertificates($certPath); + } + } + $test = $this->stat(''); + if (!$test) { + throw new Exception(); } + //create the root folder if necesary + $this->mkdir(''); + } else { + throw new Exception(); } - //create the root folder if necesary - $this->mkdir(''); + } private function createBaseUri() { diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index dd537d779a6..9702ebfb4c7 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -5,6 +5,7 @@ '> + @@ -17,6 +18,11 @@ array())); ?> $mount): ?> > + -- GitLab From 3c08d2ba23e36dbf79ea5fdabaf931bdad32b3b9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 24 Dec 2012 13:48:18 -0500 Subject: [PATCH 002/353] Change callback url to path only in case oauth parameters are still in url --- apps/files_external/js/google.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index 0b3c314eb5d..f9fb8078612 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -60,7 +60,7 @@ $(document).ready(function() { var configured = $(this).parent().find('[data-parameter="configured"]'); var token = $(this).parent().find('[data-parameter="token"]'); var token_secret = $(this).parent().find('[data-parameter="token_secret"]'); - $.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) { + $.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) { if (result && result.status == 'success') { $(configured).val('false'); $(token).val(result.data.request_token); -- GitLab From a0e47a2c67f0fe5ff3ed07174e0922dae67707dc Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 24 Dec 2012 13:55:37 -0500 Subject: [PATCH 003/353] Prevent javascript error if no value is set for the multiselect --- apps/files_external/js/settings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index eb74dd487f7..a3abcfebb8b 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -27,11 +27,16 @@ OC.MountConfig={ classOptions[$(input).data('parameter')] = $(input).val(); } }); + if ($('#externalStorage').data('admin') === true) { + var multiselect = $(tr).find('.chzn-select').val(); + if (multiselect == null) { + return false; + } + } if (addMountPoint) { var status = false; if ($('#externalStorage').data('admin') === true) { var isPersonal = false; - var multiselect = $(tr).find('.chzn-select').val(); var oldGroups = $(tr).find('.applicable').data('applicable-groups'); var oldUsers = $(tr).find('.applicable').data('applicable-users'); $.each(multiselect, function(index, value) { -- GitLab From 30a07e95737e3bed7be1d418c49fa9b60e160e7b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Dec 2012 13:35:22 -0500 Subject: [PATCH 004/353] Save configuration after paste events and 2 seconds after typing --- apps/files_external/js/settings.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index a3abcfebb8b..f2a08ed6dfb 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -157,8 +157,23 @@ $(document).ready(function() { return defaultMountPoint+append; } - $('#externalStorage td').live('change', function() { - OC.MountConfig.saveStorage($(this).parent()); + $('#externalStorage td').live('paste', function() { + var tr = $(this).parent(); + setTimeout(function() { + OC.MountConfig.saveStorage(tr); + }, 20); + }); + + var timer; + + $('#externalStorage td').live('keyup', function() { + clearTimeout(timer); + var tr = $(this).parent(); + if ($(this).val) { + timer = setTimeout(function() { + OC.MountConfig.saveStorage(tr); + }, 2000); + } }); $('td.remove>img').live('click', function() { -- GitLab From 5d68e04e5a43d6d6f52ff511f899bc831a6aa4be Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Dec 2012 13:45:22 -0500 Subject: [PATCH 005/353] Change callback url for dropbox as well --- apps/files_external/js/dropbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index c1e38640708..cc6a37d0511 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -61,7 +61,7 @@ $(document).ready(function() { var configured = $(this).parent().find('[data-parameter="configured"]'); var token = $(this).parent().find('[data-parameter="token"]'); var token_secret = $(this).parent().find('[data-parameter="token_secret"]'); - $.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) { + $.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) { if (result && result.status == 'success') { $(configured).val('false'); $(token).val(result.data.request_token); -- GitLab From 48a3966ea979a56e9277f588d6001c47e8a9c606 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Dec 2012 14:04:02 -0500 Subject: [PATCH 006/353] Listen to paste events for dropbox configuration --- apps/files_external/js/dropbox.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index cc6a37d0511..824c47d9f6d 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -36,9 +36,20 @@ $(document).ready(function() { } }); - $('#externalStorage tbody tr input').live('keyup', function() { - var tr = $(this).parent().parent(); - if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') { + $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() { + var tr = $(this).parent(); + setTimeout(function() { + showButton(tr); + }, 20); + }); + + $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() { + showButton($(this).parent().parent()); + + }); + + function showButton(tr) { + if ($(tr).find('[data-parameter="configured"]').val() != 'true') { var config = $(tr).find('.configuration'); if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') { if ($(tr).find('.dropbox').length == 0) { @@ -50,7 +61,7 @@ $(document).ready(function() { $(tr).find('.dropbox').hide(); } } - }); + } $('.dropbox').live('click', function(event) { event.preventDefault(); -- GitLab From d9ff3b68602d511ede1fd8bf2516a842dee2cfd1 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Dec 2012 14:18:51 -0500 Subject: [PATCH 007/353] Fix last commit's variable --- apps/files_external/js/dropbox.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index 824c47d9f6d..247d6bb8bb6 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -44,8 +44,7 @@ $(document).ready(function() { }); $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() { - showButton($(this).parent().parent()); - + showButton($(this).parent()); }); function showButton(tr) { -- GitLab From ad902a9848a66135ae85a04b1c66b663219a53ea Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 28 Dec 2012 12:00:48 -0500 Subject: [PATCH 008/353] Move storage backend tests from constructor to test function --- apps/files_external/lib/amazons3.php | 12 ++++++++---- apps/files_external/lib/config.php | 4 ++-- apps/files_external/lib/dropbox.php | 4 ---- apps/files_external/lib/ftp.php | 4 ---- apps/files_external/lib/google.php | 11 +++++++---- apps/files_external/lib/smb.php | 4 ---- apps/files_external/lib/webdav.php | 4 ---- lib/filestorage.php | 1 + lib/filestorage/common.php | 8 ++++++++ 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index c1b2e889bba..5ab89df732d 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -36,10 +36,6 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common { if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) { $this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret'])); $this->bucket = $params['bucket']; - $test = $this->s3->get_canonical_user_id(); - if (!isset($test['id']) || $test['id'] == '') { - throw new Exception(); - } } else { throw new Exception(); } @@ -250,4 +246,12 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common { return $response->isOK(); } + public function test() { + $test = $this->s3->get_canonical_user_id(); + if (isset($test['id']) && $test['id'] != '') { + return true; + } + return false; + } + } diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 99d31c5aa2d..fd654f04e98 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -192,8 +192,8 @@ class OC_Mount_Config { } if (class_exists($class)) { try { - new $class($options); - return true; + $storage = new $class($options); + return $storage->test(); } catch (Exception $exception) { return false; } diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index a4f3f678344..66dfd3e595e 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -41,10 +41,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { $oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth->setToken($params['token'], $params['token_secret']); $this->dropbox = new Dropbox_API($oauth, 'dropbox'); - $test = $this->stat(''); - if (!$test) { - throw new Exception('Creating OC_Filestorage_Dropbox storage failed'); - } } else { throw new Exception('Creating OC_Filestorage_Dropbox storage failed'); } diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index ac487156c18..ca408d5d224 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -33,10 +33,6 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ if ( ! $this->root || $this->root[0]!='/') { $this->root='/'.$this->root; } - $test = $this->stat(''); - if (!$test) { - throw new Exception(); - } //create the root folder if necesary if ( ! $this->is_dir('')) { $this->mkdir(''); diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 19772d4d37f..8710c979117 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -42,10 +42,6 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { $this->oauth_token = new OAuthToken($params['token'], $params['token_secret']); $this->sig_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->entries = array(); - $test = $this->free_space(''); - if (!$test) { - throw new Exception(); - } } else { throw new Exception('Creating OC_Filestorage_Google storage failed'); } @@ -594,4 +590,11 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { } + public function test() { + if ($this->free_space('')) { + return true; + } + return false; + } + } \ No newline at end of file diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 97454b46015..5b73e993e4f 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -34,10 +34,6 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ if (substr($this->share, -1, 1)=='/') { $this->share=substr($this->share, 0, -1); } - $test = $this->stat(''); - if (!$test) { - throw new Exception(); - } //create the root folder if necesary if ( ! $this->is_dir('')) { $this->mkdir(''); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index cfe073a1f1c..31d36f1e78b 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -60,10 +60,6 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ $this->client->addTrustedCertificates($certPath); } } - $test = $this->stat(''); - if (!$test) { - throw new Exception(); - } //create the root folder if necesary $this->mkdir(''); } else { diff --git a/lib/filestorage.php b/lib/filestorage.php index dd65f4421b7..9d42c0bcb60 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -64,4 +64,5 @@ abstract class OC_Filestorage{ */ abstract public function hasUpdated($path, $time); abstract public function getOwner($path); + abstract public function test(); } diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index b97eb79d8d4..e2af0c6d7f4 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -288,4 +288,12 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { public function getOwner($path) { return OC_User::getUser(); } + + public function test() { + if ($this->stat('')) { + return true; + } + return false; + } + } -- GitLab From 595e72ade8906346c9de8500685f5968d67afd2f Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 28 Dec 2012 15:56:48 -0500 Subject: [PATCH 009/353] Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ownCloud / WebDAV --- apps/files_external/js/settings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index f2a08ed6dfb..182c427e180 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -100,7 +100,7 @@ $(document).ready(function() { var backendClass = $(this).val(); $(this).parent().text(selected); if ($(tr).find('.mountPoint input').val() == '') { - $(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, ''))); + $(tr).find('.mountPoint input').val(suggestMountPoint(selected)); } $(tr).addClass(backendClass); $(tr).find('.status').append(''); @@ -136,6 +136,11 @@ $(document).ready(function() { }); function suggestMountPoint(defaultMountPoint) { + var pos = defaultMountPoint.indexOf('/'); + if (pos !== -1) { + defaultMountPoint = defaultMountPoint.substring(0, pos); + } + defaultMountPoint = defaultMountPoint.replace(/\s+/g, ''); var i = 1; var append = ''; var match = true; -- GitLab From 442a045ef605f63c1fed3868ef9ddad28c33409b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 28 Dec 2012 17:38:24 -0500 Subject: [PATCH 010/353] Fix problems with chosen multiselect --- apps/files_external/js/settings.js | 46 ++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 182c427e180..25f6ed57984 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -39,6 +39,8 @@ OC.MountConfig={ var isPersonal = false; var oldGroups = $(tr).find('.applicable').data('applicable-groups'); var oldUsers = $(tr).find('.applicable').data('applicable-users'); + var groups = []; + var users = []; $.each(multiselect, function(index, value) { var pos = value.indexOf('(group)'); if (pos != -1) { @@ -47,12 +49,14 @@ OC.MountConfig={ if ($.inArray(applicable, oldGroups) != -1) { oldGroups.splice($.inArray(applicable, oldGroups), 1); } + groups.push(applicable); } else { var mountType = 'user'; var applicable = value; if ($.inArray(applicable, oldUsers) != -1) { oldUsers.splice($.inArray(applicable, oldUsers), 1); } + users.push(applicable); } $.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) { statusSpan.removeClass(); @@ -63,6 +67,8 @@ OC.MountConfig={ } }); }); + $(tr).find('.applicable').data('applicable-groups', groups); + $(tr).find('.applicable').data('applicable-users', users); var mountType = 'group'; $.each(oldGroups, function(index, applicable) { $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); @@ -128,7 +134,11 @@ $(document).ready(function() { return false; } }); - $('.chz-select').chosen(); + // Reset chosen + var chosen = $(tr).find('.applicable select'); + chosen.parent().find('div').remove(); + chosen.removeAttr('id').removeClass('chzn-done').css({display:'inline-block'}); + chosen.chosen(); $(tr).find('td').last().attr('class', 'remove'); $(tr).find('td').last().removeAttr('style'); $(tr).removeAttr('id'); @@ -171,9 +181,9 @@ $(document).ready(function() { var timer; - $('#externalStorage td').live('keyup', function() { + $('#externalStorage td input').live('keyup', function() { clearTimeout(timer); - var tr = $(this).parent(); + var tr = $(this).parent().parent(); if ($(this).val) { timer = setTimeout(function() { OC.MountConfig.saveStorage(tr); @@ -181,6 +191,10 @@ $(document).ready(function() { } }); + $('.applicable .chzn-select').live('change', function() { + OC.MountConfig.saveStorage($(this).parent().parent()); + }); + $('td.remove>img').live('click', function() { var tr = $(this).parent().parent(); var mountPoint = $(tr).find('.mountPoint input').val(); @@ -193,23 +207,25 @@ $(document).ready(function() { if ($('#externalStorage').data('admin') === true) { var isPersonal = false; var multiselect = $(tr).find('.chzn-select').val(); - $.each(multiselect, function(index, value) { - var pos = value.indexOf('(group)'); - if (pos != -1) { - var mountType = 'group'; - var applicable = value.substr(0, pos); - } else { - var mountType = 'user'; - var applicable = value; - } - $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); - }); + if (multiselect != null) { + $.each(multiselect, function(index, value) { + var pos = value.indexOf('(group)'); + if (pos != -1) { + var mountType = 'group'; + var applicable = value.substr(0, pos); + } else { + var mountType = 'user'; + var applicable = value; + } + $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); + }); + } } else { var mountType = 'user'; var applicable = OC.currentUser; var isPersonal = true; + $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); } - $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); $(tr).remove(); }); -- GitLab From a69de3a8f1dd3ef9a17b0f65b7058681eebb6145 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 1 Jan 2013 16:19:40 -0500 Subject: [PATCH 011/353] Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons --- apps/files_external/js/dropbox.js | 49 ++++++++++--------- apps/files_external/js/google.js | 67 ++++++++++++------------- apps/files_external/js/settings.js | 78 ++++++++++++++++++++++++------ 3 files changed, 123 insertions(+), 71 deletions(-) diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index 247d6bb8bb6..92a92467c79 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -24,14 +24,12 @@ $(document).ready(function() { $(tr).find('.configuration input').attr('disabled', 'disabled'); $(tr).find('.configuration').append(''+t('files_external', 'Access granted')+''); } else { - OC.dialogs.alert(result.data.message, - t('files_external', 'Error configuring Dropbox storage') - ); + OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage')); } }); } - } else if ($(this).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '' && $(this).find('.dropbox').length == 0) { - $(this).find('.configuration').append(''+t('files_external', 'Grant access')+''); + } else { + onDropboxInputsChange($(this)); } } }); @@ -39,18 +37,27 @@ $(document).ready(function() { $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() { var tr = $(this).parent(); setTimeout(function() { - showButton(tr); + onDropboxInputsChange(tr); }, 20); }); $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() { - showButton($(this).parent()); + onDropboxInputsChange($(this).parent()); }); - function showButton(tr) { + $('#externalStorage tbody tr.OC_Filestorage_Dropbox .chzn-select').live('change', function() { + onDropboxInputsChange($(this).parent().parent()); + }); + + function onDropboxInputsChange(tr) { if ($(tr).find('[data-parameter="configured"]').val() != 'true') { var config = $(tr).find('.configuration'); - if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') { + if ($(tr).find('.mountPoint input').val() != '' + && $(config).find('[data-parameter="app_key"]').val() != '' + && $(config).find('[data-parameter="app_secret"]').val() != '' + && ($(tr).find('.chzn-select').length == 0 + || $(tr).find('.chzn-select').val() != null)) + { if ($(tr).find('.dropbox').length == 0) { $(config).append(''+t('files_external', 'Grant access')+''); } else { @@ -64,8 +71,10 @@ $(document).ready(function() { $('.dropbox').live('click', function(event) { event.preventDefault(); + var tr = $(this).parent().parent(); var app_key = $(this).parent().find('[data-parameter="app_key"]').val(); var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val(); + var statusSpan = $(tr).find('.status span'); if (app_key != '' && app_secret != '') { var tr = $(this).parent().parent(); var configured = $(this).parent().find('[data-parameter="configured"]'); @@ -76,25 +85,19 @@ $(document).ready(function() { $(configured).val('false'); $(token).val(result.data.request_token); $(token_secret).val(result.data.request_token_secret); - if (OC.MountConfig.saveStorage(tr)) { - window.location = result.data.url; - } else { - OC.dialogs.alert( - t('files_external', 'Fill out all required fields'), - t('files_external', 'Error configuring Dropbox storage') - ); - } + OC.MountConfig.saveStorage(tr); + statusSpan.removeClass(); + statusSpan.addClass('waiting'); + window.location = result.data.url; } else { - OC.dialogs.alert(result.data.message, - t('files_external', 'Error configuring Dropbox storage') - ); + OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage')); } }); } else { OC.dialogs.alert( - t('files_external', 'Please provide a valid Dropbox app key and secret.'), - t('files_external', 'Error configuring Dropbox storage') - ); + t('files_external', 'Please provide a valid Dropbox app key and secret.'), + t('files_external', 'Error configuring Dropbox storage') + ); } }); diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index f9fb8078612..a3b3e9cb3d2 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -3,8 +3,7 @@ $(document).ready(function() { $('#externalStorage tbody tr.OC_Filestorage_Google').each(function() { var configured = $(this).find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $(this).find('.configuration') - .append(''+t('files_external', 'Access granted')+''); + $(this).find('.configuration').append(''+t('files_external', 'Access granted')+''); } else { var token = $(this).find('[data-parameter="token"]'); var token_secret = $(this).find('[data-parameter="token_secret"]'); @@ -22,37 +21,44 @@ $(document).ready(function() { OC.MountConfig.saveStorage(tr); $(tr).find('.configuration').append(''+t('files_external', 'Access granted')+''); } else { - OC.dialogs.alert(result.data.message, - t('files_external', 'Error configuring Google Drive storage') - ); + OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage')); } }); - } else if ($(this).find('.google').length == 0) { - $(this).find('.configuration').append(''+t('files_external', 'Grant access')+''); + } else { + onGoogleInputsChange(this); } } }); - $('#externalStorage tbody tr').live('change', function() { - if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') { - if ($(this).find('.mountPoint input').val() != '') { - if ($(this).find('.google').length == 0) { - $(this).find('.configuration').append(''+t('files_external', 'Grant access')+''); - } - } - } + $('#externalStorage tbody tr.OC_Filestorage_Google td').live('paste', function() { + var tr = $(this).parent(); + setTimeout(function() { + onGoogleInputsChange(tr); + }, 20); }); - $('#externalStorage tbody tr .mountPoint input').live('keyup', function() { - var tr = $(this).parent().parent(); - if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) { - if ($(this).val() != '') { - $(tr).find('.google').show(); - } else { + $('#externalStorage tbody tr.OC_Filestorage_Google td').live('keyup', function() { + onGoogleInputsChange($(this).parent()); + }); + + $('#externalStorage tbody tr.OC_Filestorage_Google .chzn-select').live('change', function() { + onGoogleInputsChange($(this).parent().parent()); + }); + + function onGoogleInputsChange(tr) { + if ($(tr).find('[data-parameter="configured"]').val() != 'true') { + var config = $(tr).find('.configuration'); + if ($(tr).find('.mountPoint input').val() != '' && ($(tr).find('.chzn-select').length == 0 || $(tr).find('.chzn-select').val() != null)) { + if ($(tr).find('.google').length == 0) { + $(config).append(''+t('files_external', 'Grant access')+''); + } else { + $(tr).find('.google').show(); + } + } else if ($(tr).find('.google').length > 0) { $(tr).find('.google').hide(); } } - }); + } $('.google').live('click', function(event) { event.preventDefault(); @@ -60,23 +66,18 @@ $(document).ready(function() { var configured = $(this).parent().find('[data-parameter="configured"]'); var token = $(this).parent().find('[data-parameter="token"]'); var token_secret = $(this).parent().find('[data-parameter="token_secret"]'); + var statusSpan = $(tr).find('.status span'); $.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) { if (result && result.status == 'success') { $(configured).val('false'); $(token).val(result.data.request_token); $(token_secret).val(result.data.request_token_secret); - if (OC.MountConfig.saveStorage(tr)) { - window.location = result.data.url; - } else { - OC.dialogs.alert( - t('files_external', 'Fill out all required fields'), - t('files_external', 'Error configuring Google Drive storage') - ); - } + OC.MountConfig.saveStorage(tr); + statusSpan.removeClass(); + statusSpan.addClass('waiting'); + window.location = result.data.url; } else { - OC.dialogs.alert(result.data.message, - t('files_external', 'Error configuring Google Drive storage') - ); + OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage')); } }); }); diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 25f6ed57984..b98fcf1b0ae 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -58,12 +58,25 @@ OC.MountConfig={ } users.push(applicable); } - $.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) { - statusSpan.removeClass(); - if (result && result.status == 'success' && result.data.message) { - statusSpan.addClass('success'); - } else { - statusSpan.addClass('error'); + $.ajax({type: 'POST', + url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'), + data: { + mountPoint: mountPoint, + class: backendClass, + classOptions: classOptions, + mountType: mountType, + applicable: applicable, + isPersonal: isPersonal + }, + async: false, + success: function(result) { + statusSpan.removeClass(); + if (result && result.status == 'success' && result.data.message) { + status = true; + statusSpan.addClass('success'); + } else { + statusSpan.addClass('error'); + } } }); }); @@ -71,26 +84,61 @@ OC.MountConfig={ $(tr).find('.applicable').data('applicable-users', users); var mountType = 'group'; $.each(oldGroups, function(index, applicable) { - $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); + $.ajax({type: 'POST', + url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), + data: { + mountPoint: mountPoint, + class: backendClass, + classOptions: classOptions, + mountType: mountType, + applicable: applicable, + isPersonal: isPersonal + }, + async: false + }); }); var mountType = 'user'; $.each(oldUsers, function(index, applicable) { - $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); + $.ajax({type: 'POST', + url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), + data: { + mountPoint: mountPoint, + class: backendClass, + classOptions: classOptions, + mountType: mountType, + applicable: applicable, + isPersonal: isPersonal + }, + async: false + }); }); } else { var isPersonal = true; var mountType = 'user'; var applicable = OC.currentUser; - $.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) { - statusSpan.removeClass(); - if (result && result.status == 'success' && result.data.message) { - statusSpan.addClass('success'); - } else { - statusSpan.addClass('error'); + $.ajax({type: 'POST', + url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'), + data: { + mountPoint: mountPoint, + class: backendClass, + classOptions: classOptions, + mountType: mountType, + applicable: applicable, + isPersonal: isPersonal + }, + async: false, + success: function(result) { + statusSpan.removeClass(); + if (result && result.status == 'success' && result.data.message) { + status = true; + statusSpan.addClass('success'); + } else { + statusSpan.addClass('error'); + } } }); } - return true; + return status; } } }; -- GitLab From d65cb7ae0954e89de0a1b56170ffab683c39e3cc Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 2 Jan 2013 11:54:21 -0500 Subject: [PATCH 012/353] Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added --- apps/files_external/appinfo/update.php | 5 +++++ apps/files_external/js/google.js | 26 +++++++++++++++------- apps/files_external/templates/settings.php | 5 ++--- 3 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 apps/files_external/appinfo/update.php diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php new file mode 100644 index 00000000000..15d7e4168ee --- /dev/null +++ b/apps/files_external/appinfo/update.php @@ -0,0 +1,5 @@ +tr:last').prev('tr')); + } + }); + + function setupGoogleRow(tr) { + var configured = $(tr).find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $(this).find('.configuration').append(''+t('files_external', 'Access granted')+''); + $(tr).find('.configuration').append(''+t('files_external', 'Access granted')+''); } else { - var token = $(this).find('[data-parameter="token"]'); - var token_secret = $(this).find('[data-parameter="token_secret"]'); + var token = $(tr).find('[data-parameter="token"]'); + var token_secret = $(tr).find('[data-parameter="token_secret"]'); var params = {}; window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) { params[key] = value; }); if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) { - var tr = $(this); $.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) { if (result && result.status == 'success') { $(token).val(result.access_token); @@ -22,13 +31,14 @@ $(document).ready(function() { $(tr).find('.configuration').append(''+t('files_external', 'Access granted')+''); } else { OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage')); + onGoogleInputsChange(tr); } }); } else { - onGoogleInputsChange(this); + onGoogleInputsChange(tr); } } - }); + } $('#externalStorage tbody tr.OC_Filestorage_Google td').live('paste', function() { var tr = $(this).parent(); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 9702ebfb4c7..6f22de392fa 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -73,9 +73,8 @@ - - + + -- GitLab From db90f2c296c4a74933c2d258d8b335a3093db0f9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 2 Jan 2013 12:13:59 -0500 Subject: [PATCH 013/353] Listen to checkbox changes as well --- apps/files_external/js/settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index b98fcf1b0ae..2a8d8d2c284 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -239,6 +239,10 @@ $(document).ready(function() { } }); + $('#externalStorage td input:checkbox').live('change', function() { + OC.MountConfig.saveStorage($(this).parent().parent().parent()); + }); + $('.applicable .chzn-select').live('change', function() { OC.MountConfig.saveStorage($(this).parent().parent()); }); -- GitLab From 7f218c4dc07edd2393ffa132745dcc0df16508e3 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 2 Jan 2013 13:20:44 -0500 Subject: [PATCH 014/353] Remove accidentally included file --- apps/files_external/appinfo/update.php | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 apps/files_external/appinfo/update.php diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php deleted file mode 100644 index 15d7e4168ee..00000000000 --- a/apps/files_external/appinfo/update.php +++ /dev/null @@ -1,5 +0,0 @@ - Date: Wed, 9 Jan 2013 21:47:24 -0500 Subject: [PATCH 015/353] Set status to waiting for Dropbox and Google Drive while authenticating --- apps/files_external/js/dropbox.js | 3 +++ apps/files_external/js/google.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index 92a92467c79..9314a4c7927 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -15,6 +15,9 @@ $(document).ready(function() { if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) { var token_secret = $(this).find('.configuration [data-parameter="token_secret"]'); var tr = $(this); + var statusSpan = $(tr).find('.status span'); + statusSpan.removeClass(); + statusSpan.addClass('waiting'); $.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) { if (result && result.status == 'success') { $(token).val(result.access_token); diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index 89daa0078e8..ad6fc6a0f9a 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -22,6 +22,9 @@ $(document).ready(function() { params[key] = value; }); if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) { + var statusSpan = $(tr).find('.status span'); + statusSpan.removeClass(); + statusSpan.addClass('waiting'); $.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) { if (result && result.status == 'success') { $(token).val(result.access_token); -- GitLab From 4d3d8ed296a148b5dfdd7970ba2779e39ebe91db Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 31 Jan 2013 17:59:01 +0100 Subject: [PATCH 016/353] Trash: highlight Files navigation entry while in trash --- apps/files_trashbin/index.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 46a601cfdde..a07ef8a68ad 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -1,8 +1,10 @@ getAbsolutePath($dir); $dirContent = opendir($fullpath); $i = 0; @@ -35,7 +37,7 @@ if ($dir) { 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file', 'location' => $dir, ); - } + } } closedir($fullpath); @@ -66,28 +68,28 @@ foreach ($result as $r) { $files[] = $i; } -// Make breadcrumb -$breadcrumb = array(array('dir' => '', 'name' => 'Trash')); -$pathtohere = ''; -foreach (explode('/', $dir) as $i) { +// Make breadcrumb +$breadcrumb = array(array('dir' => '', 'name' => 'Trash')); +$pathtohere = ''; +foreach (explode('/', $dir) as $i) { if ($i != '') { if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) { $name = $match[1]; } else { $name = $i; - } - $pathtohere .= '/' . $i; - $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name); - } + } + $pathtohere .= '/' . $i; + $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name); + } } -$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); -$breadcrumbNav->assign('breadcrumb', $breadcrumb, false); +$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); +$breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=', false); $list = new OCP\Template('files_trashbin', 'part.list', ''); $list->assign('files', $files, false); -$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir, false); +$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir, false); $list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir, false); $list->assign('disableSharing', true); $list->assign('dirlisting', $dirlisting); -- GitLab From 73cd1169684fe52fb63f1d7695c2bdaab1fc7f46 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 31 Jan 2013 18:04:00 +0100 Subject: [PATCH 017/353] Trash: don't use depricated filesystem api classes --- apps/files_trashbin/index.php | 2 +- apps/files_trashbin/lib/trash.php | 212 +++++++++++++++--------------- 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index a07ef8a68ad..4f0a697939c 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -97,6 +97,6 @@ $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('files', $files); -$tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); +$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->printPage(); diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index a7eff3d44e0..1c66fac8903 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -1,109 +1,109 @@ . - * - */ +/** + * ownCloud - trash bin + * + * @author Bjoern Schiessle + * @copyright 2013 Bjoern Schiessle schiessle@owncloud.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ + +namespace OCA_Trash; -namespace OCA_Trash; - class Trashbin { const DEFAULT_RETENTION_OBLIGATION=180; // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) /** * move file to the trash bin * - * @param $file_path path to the deleted file/directory relative to the files root directory + * @param string $file_path path to the deleted file/directory relative to the files root directory */ public static function move2trash($file_path) { $user = \OCP\User::getUser(); - $view = new \OC_FilesystemView('/'. $user); - if (!$view->is_dir('files_trashbin')) { - $view->mkdir('files_trashbin'); - $view->mkdir("versions_trashbin"); - } - - $path_parts = pathinfo($file_path); - - $deleted = $path_parts['basename']; - $location = $path_parts['dirname']; - $timestamp = time(); - $mime = $view->getMimeType('files'.$file_path); - - if ( $view->is_dir('files'.$file_path) ) { - $type = 'dir'; - } else { - $type = 'file'; - } + $view = new \OC\Files\View('/'. $user); + if (!$view->is_dir('files_trashbin')) { + $view->mkdir('files_trashbin'); + $view->mkdir("versions_trashbin"); + } + + $path_parts = pathinfo($file_path); + + $deleted = $path_parts['basename']; + $location = $path_parts['dirname']; + $timestamp = time(); + $mime = $view->getMimeType('files'.$file_path); + + if ( $view->is_dir('files'.$file_path) ) { + $type = 'dir'; + } else { + $type = 'file'; + } self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); - if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) { - $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); + if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) { + $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. $view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp); \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR); return; - } - - if ( \OCP\App::isEnabled('files_versions') ) { - if ( $view->is_dir('files_versions'.$file_path) ) { - $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp); - } else if ( $versions = \OCA_Versions\Storage::getVersions($file_path) ) { - foreach ($versions as $v) { - $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); - } - } + } + + if ( \OCP\App::isEnabled('files_versions') ) { + if ( $view->is_dir('files_versions'.$file_path) ) { + $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp); + } else if ( $versions = \OCA_Versions\Storage::getVersions($file_path) ) { + foreach ($versions as $v) { + $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); + } + } } } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin' , \OC_log::ERROR); } - self::expire(); + self::expire(); } /** * restore files from trash bin - * @param $file path to the deleted file - * @param $filename name of the file - * @param $timestamp time when the file was deleted + * @param string $file path to the deleted file + * @param string $filename name of the file + * @param int $timestamp time when the file was deleted */ public static function restore($file, $filename, $timestamp) { $user = \OCP\User::getUser(); - $view = new \OC_FilesystemView('/'.$user); + $view = new \OC\Files\View('/'.$user); if ( $timestamp ) { - $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); $result = $query->execute(array($user,$filename,$timestamp))->fetchAll(); if ( count($result) != 1 ) { \OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR); return false; } - // if location no longer exists, restore file in the root directory - $location = $result[0]['location']; + // if location no longer exists, restore file in the root directory + $location = $result[0]['location']; if ( $result[0]['location'] != '/' && (!$view->is_dir('files'.$result[0]['location']) || - !$view->isUpdatable('files'.$result[0]['location'])) ) { - $location = ''; + !$view->isUpdatable('files'.$result[0]['location'])) ) { + $location = ''; } } else { $path_parts = pathinfo($filename); @@ -114,8 +114,8 @@ class Trashbin { $location = ''; } - $source = \OC_Filesystem::normalizePath('files_trashbin/'.$file); - $target = \OC_Filesystem::normalizePath('files/'.$location.'/'.$filename); + $source = \OC\Files\Filesystem::normalizePath('files_trashbin/'.$file); + $target = \OC\Files\Filesystem::normalizePath('files/'.$location.'/'.$filename); // we need a extension in case a file/dir with the same name already exists $ext = self::getUniqueExtension($location, $filename, $view); @@ -123,22 +123,22 @@ class Trashbin { if( $view->rename($source, $target.$ext) ) { $view->touch($target.$ext, $mtime); // if versioning app is enabled, copy versions from the trash bin back to the original location - if ( \OCP\App::isEnabled('files_versions') ) { - if ( $result[0]['type'] == 'dir' ) { - $view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); - } else if ( $versions = self::getVersionsFromTrash($file, $timestamp) ) { + if ( \OCP\App::isEnabled('files_versions') ) { + if ( $result[0]['type'] == 'dir' ) { + $view->rename(\OC\Files\Filesystem::normalizePath('versions_trashbin/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); + } else if ( $versions = self::getVersionsFromTrash($file, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { $view->rename('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } else { $view->rename('versions_trashbin/'.$file.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); - } - } - } + } + } + } } if ( $timestamp ) { - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); $query->execute(array($user,$filename,$timestamp)); } @@ -150,15 +150,15 @@ class Trashbin { return false; } - /** - * clean up the trash bin - */ + /** + * clean up the trash bin + */ private static function expire() { - $view = new \OC_FilesystemView('/'.\OCP\User::getUser()); + $view = new \OC\Files\View('/'.\OCP\User::getUser()); $user = \OCP\User::getUser(); - $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?'); + $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?'); $result = $query->execute(array($user))->fetchAll(); $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION); @@ -180,16 +180,16 @@ class Trashbin { } } - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestampexecute(array($user,$limit)); + $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestampexecute(array($user,$limit)); } /** * recursive copy to copy a whole directory * - * @param $source source path, relative to the users files directory - * @param $destination destination path relative to the users root directoy - * @param $view file view for the users root directory + * @param string $source source path, relative to the users files directory + * @param string $destination destination path relative to the users root directoy + * @param \OC\Files\View $view file view for the users root directory */ private static function copy_recursive( $source, $destination, $view ) { if ( $view->is_dir( 'files'.$source ) ) { @@ -212,28 +212,28 @@ class Trashbin { /** * find all versions which belong to the file we want to restore - * @param $filename name of the file which should be restored - * @param $timestamp timestamp when the file was deleted + * @param string $filename name of the file which should be restored + * @param int $timestamp timestamp when the file was deleted */ private static function getVersionsFromTrash($filename, $timestamp) { - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/versions_trashbin'); - $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename); - $versions = array(); + $view = new \OC\Files\View('/'.\OCP\User::getUser().'/versions_trashbin'); + $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename); + $versions = array(); if ($timestamp ) { - // fetch for old versions + // fetch for old versions $matches = glob( $versionsName.'.v*.d'.$timestamp ); $offset = -strlen($timestamp)-2; } else { $matches = glob( $versionsName.'.v*' ); - } - + } + foreach( $matches as $ma ) { if ( $timestamp ) { - $parts = explode( '.v', substr($ma, 0, $offset) ); + $parts = explode( '.v', substr($ma, 0, $offset) ); $versions[] = ( end( $parts ) ); } else { - $parts = explode( '.v', $ma ); + $parts = explode( '.v', $ma ); $versions[] = ( end( $parts ) ); } } @@ -242,23 +242,23 @@ class Trashbin { /** * find unique extension for restored file if a file with the same name already exists - * @param $location where the file should be restored - * @param $filename name of the file - * @param $view filesystem view relative to users root directory + * @param string $location where the file should be restored + * @param string $filename name of the file + * @param \OC\Files\View $view filesystem view relative to users root directory * @return string with unique extension */ private static function getUniqueExtension($location, $filename, $view) { - $ext = ''; - if ( $view->file_exists('files'.$location.'/'.$filename) ) { - $tmpext = '.restored'; - $ext = $tmpext; - $i = 1; - while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) { - $ext = $tmpext.$i; - $i++; - } + $ext = ''; + if ( $view->file_exists('files'.$location.'/'.$filename) ) { + $tmpext = '.restored'; + $ext = $tmpext; + $i = 1; + while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) { + $ext = $tmpext.$i; + $i++; + } } return $ext; } -} +} -- GitLab From 3756f235ce2739c6384d3a075348b9d92dd827fe Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 31 Jan 2013 18:14:22 +0100 Subject: [PATCH 018/353] Trash: enable fileactions while viewing trash --- apps/files_trashbin/js/trash.js | 36 ++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 3ad0ab04fb9..d45430dcbd5 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -18,10 +18,10 @@ $(document).ready(function() { OC.dialogs.alert(result.data.message, 'Error'); } }); - + }); }; - + // Sets the select_all checkbox behaviour : $('#select_all').click(function() { if($(this).attr('checked')){ @@ -63,19 +63,19 @@ $(document).ready(function() { } } processSelection(); - }); - + }); + $('.undelete').click('click',function(event) { var spinner = ''; var files=getSelectedFiles('file'); var fileslist=files.join(';'); var dirlisting=getSelectedFiles('dirlisting')[0]; - + for (var i in files) { var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; } - + $.post(OC.filePath('files_trashbin','ajax','undelete.php'), {files:fileslist, dirlisting:dirlisting}, function(result){ @@ -86,10 +86,24 @@ $(document).ready(function() { if (result.status != 'success') { OC.dialogs.alert(result.data.message, 'Error'); } - }); + }); }); - + $('#fileList').on('click', 'td.filename a', function(event) { + var filename = $(this).parent().parent().attr('data-file'); + var tr = $('tr').filterAttr('data-file',filename); + var renaming = tr.data('renaming'); + if(!renaming && !FileList.isLoading(filename)){ + var mime = $(this).parent().parent().data('mime'); + var type = $(this).parent().parent().data('type'); + var permissions = $(this).parent().parent().data('permissions'); + var action = FileActions.getDefault(mime, type, permissions); + if(action){ + event.preventDefault(); + action(filename); + } + } + }); }); function processSelection(){ @@ -155,4 +169,8 @@ function getSelectedFiles(property){ } }); return files; -} \ No newline at end of file +} + +function fileDownloadPath(dir, file) { + return OC.filePath('files_trashbin', '', 'download.php') + '?file='+encodeURIComponent(file); +} -- GitLab From 9d74ce45955ce9969b6d356a114b02780b5645f8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 31 Jan 2013 19:19:58 +0100 Subject: [PATCH 019/353] Trash: fix opening folders --- apps/files_trashbin/js/trash.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index d45430dcbd5..f2797347b82 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -104,6 +104,8 @@ $(document).ready(function() { } } }); + + FileActions.actions.dir = {}; }); function processSelection(){ -- GitLab From 697536cf6ad1c9a862c32605b807172dfa680d22 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 31 Jan 2013 19:36:59 +0100 Subject: [PATCH 020/353] Trash: use the same sorting algoritm as files --- apps/files_trashbin/index.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 4f0a697939c..a4eb5cd216c 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -68,6 +68,18 @@ foreach ($result as $r) { $files[] = $i; } +function fileCmp($a, $b) { + if ($a['type'] == 'dir' and $b['type'] != 'dir') { + return -1; + } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') { + return 1; + } else { + return strnatcasecmp($a['name'], $b['name']); + } +} + +usort($files, "fileCmp"); + // Make breadcrumb $breadcrumb = array(array('dir' => '', 'name' => 'Trash')); $pathtohere = ''; -- GitLab From f2b5bc8ab8fadaee3db3a03e6a4748fdb28a01b1 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 7 Feb 2013 14:47:56 +0100 Subject: [PATCH 021/353] adding autotesting for mssql server - windows only --- autotest.cmd | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/autotest.cmd b/autotest.cmd index 053860db547..e5ea0cf4c35 100644 --- a/autotest.cmd +++ b/autotest.cmd @@ -4,14 +4,14 @@ :: @author Thomas Müller :: @author Tobias Ramforth (translated into Windows batch file) :: -:: @copyright 2012 Thomas Müller thomas.mueller@tmit.eu +:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu :: @echo off set DATADIR=data-autotest set BASEDIR=%~dp0 -:: create autoconfig for sqlite, mysql and postgresql +:: create autoconfig for sqlite, mysql, postgresql and mssql echo ^ .\tests\autoconfig-sqlite.php echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-sqlite.php echo 'installed' ^=^> false^, >> .\tests\autoconfig-sqlite.php @@ -50,16 +50,35 @@ echo 'dbhost' ^=^> 'localhost'^, >> .\tests\autoconfig-pgsql.php echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-pgsql.php echo ^)^; >> .\tests\autoconfig-pgsql.php +echo ^ .\tests\autoconfig-mssql.php +echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-mssql.php +echo 'installed' ^=^> false^, >> .\tests\autoconfig-mssql.php +echo 'dbtype' ^=^> 'mssql'^, >> .\tests\autoconfig-mssql.php +echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-mssql.php +echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php +echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php +echo 'directory' ^=^> '%BASEDIR%%DATADIR%'^, >> .\tests\autoconfig-mssql.php +echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php +echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php +echo 'dbhost' ^=^> 'localhost\sqlexpress'^, >> .\tests\autoconfig-mssql.php +echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-mssql.php +echo ^)^; >> .\tests\autoconfig-mssql.php + echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf :: :: start test execution :: -::call:execute_tests "sqlite" -call:execute_tests "mysql" -::call:execute_tests "mssql" -::call:execute_tests "ora" -::call:execute_tests "pgsql" +if [%1] == [] ( + echo "Running on all database backends" + call:execute_tests "sqlite" + call:execute_tests "mysql" + call:execute_tests "mssql" + ::call:execute_tests "ora" + call:execute_tests "pgsql" +) else ( + call:execute_tests "%1" +) goto:eof @@ -83,6 +102,9 @@ goto:eof if "%~1" == "mysql" mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest" if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest + + :: we assume a sqlexpress installation + if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotext -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" :: copy autoconfig copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php @@ -96,9 +118,8 @@ goto:eof rmdir /s /q coverage-html-%~1 md coverage-html-%~1 php -f enable_all.php - ::phpunit --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 - ::phpunit --bootstrap bootstrap.php --configuration phpunit.xml - php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 + + php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 echo "Done with testing %~1 ..." cd %BASEDIR% goto:eof @@ -114,4 +135,10 @@ goto:eof :: - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine): :: local all all trust :: +:: NOTES on mssql: +:: we assume the usage of a local installed sqlexpress +:: create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator' +:: make sure the sqlserver is configured to allow sql authentication +:: + -- GitLab From d577f790c8cbcf4f8dce74f9991e4bd62e21f949 Mon Sep 17 00:00:00 2001 From: Tobias Ramforth Date: Fri, 8 Feb 2013 00:00:51 +0100 Subject: [PATCH 022/353] Added MS SQL Server support --- core/js/setup.js | 7 ++ core/setup.php | 2 + core/templates/installation.php | 20 +++- lib/db.php | 180 +++++++++++++++++++++++++++++++- lib/setup.php | 148 +++++++++++++++++++++++++- 5 files changed, 346 insertions(+), 11 deletions(-) diff --git a/core/js/setup.js b/core/js/setup.js index 9aded6591ca..fb6e7c5097c 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -5,6 +5,7 @@ $(document).ready(function() { mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), oracle:!!$('#hasOracle').val(), + mssql:!!$('#hasMSSQL').val() }; $('#selectDbType').buttonset(); @@ -41,6 +42,12 @@ $(document).ready(function() { $('#dbhost').show(250); $('#dbhostlabel').show(250); }); + + $('#mssql').click(function() { + $('#use_other_db').slideDown(250); + $('#dbhost').show(250); + $('#dbhostlabel').show(250); + }); $('input[checked]').trigger('click'); diff --git a/core/setup.php b/core/setup.php index 66b8cf378bd..0da9b35a35a 100644 --- a/core/setup.php +++ b/core/setup.php @@ -16,6 +16,7 @@ $hasSQLite = class_exists('SQLite3'); $hasMySQL = is_callable('mysql_connect'); $hasPostgreSQL = is_callable('pg_connect'); $hasOracle = is_callable('oci_connect'); +$hasMSSQL = is_callable('sqlsrv_connect'); $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); // Protect data directory here, so we can test if the protection is working @@ -26,6 +27,7 @@ $opts = array( 'hasMySQL' => $hasMySQL, 'hasPostgreSQL' => $hasPostgreSQL, 'hasOracle' => $hasOracle, + 'hasMSSQLServer' => $hasMSSQL, 'directory' => $datadir, 'secureRNG' => OC_Util::secureRNG_available(), 'htaccessWorking' => OC_Util::ishtaccessworking(), diff --git a/core/templates/installation.php b/core/templates/installation.php index 03c580c9b0b..6a6370785d3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -2,6 +2,7 @@ '> '> '> +'>
0): ?> @@ -55,7 +56,7 @@
- + t( 'Configure the database' ); ?>
@@ -71,7 +72,7 @@ - +

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

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

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

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

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

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

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

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

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

- + /> diff --git a/lib/db.php b/lib/db.php index 58f46c1171f..c3ff481e19e 100644 --- a/lib/db.php +++ b/lib/db.php @@ -284,7 +284,7 @@ class OC_DB { $dsn['database'] = $user; } break; - case 'mssql': + case 'mssql': $dsn = array( 'phptype' => 'sqlsrv', 'username' => $user, @@ -292,7 +292,7 @@ class OC_DB { 'hostspec' => $host, 'database' => $name ); - break; + break; default: return false; } @@ -920,28 +920,30 @@ class PDOStatementWrapper{ * make execute return the result instead of a bool */ public function execute($input=array()) { - $this->lastArguments=$input; - if(count($input)>0) { - if (!isset($type)) { - $type = OC_Config::getValue( "dbtype", "sqlite" ); - } - - if ($type == 'mssql') { - $this->tryFixSubstringLastArgumentDataForMSSQL($input); - } - + $this->lastArguments = $input; + if (count($input) > 0) { + + if (!isset($type)) { + $type = OC_Config::getValue( "dbtype", "sqlite" ); + } + + if ($type == 'mssql') { + $input = $this->tryFixSubstringLastArgumentDataForMSSQL($input); + } + $result=$this->statement->execute($input); - }else{ + } else { $result=$this->statement->execute(); } - if($result) { + + if ($result) { return $this; - }else{ + } else { return false; } } - private function tryFixSubstringLastArgumentDataForMSSQL(&$input) { + private function tryFixSubstringLastArgumentDataForMSSQL($input) { $query = $this->statement->queryString; $pos = stripos ($query, 'SUBSTRING'); @@ -1013,6 +1015,8 @@ class PDOStatementWrapper{ $this->statement = $PDO->prepare($newQuery); $this->lastArguments = $input; + + return $input; } catch (PDOException $e){ $entry = 'PDO DB Error: "'.$e->getMessage().'"
'; $entry .= 'Offending command was: '.$this->statement->queryString .'
'; diff --git a/lib/setup.php b/lib/setup.php index d4ea26354ef..3efad79cfad 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -610,98 +610,155 @@ class OC_Setup { self::mssql_createDatabase($dbname, $masterConnection); - self::mssql_createDBUser($dbuser, $dbpass, $masterConnection); + self::mssql_createDBUser($dbuser, $dbname, $masterConnection); sqlsrv_close($masterConnection); - $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); - - $connection = @sqlsrv_connect($dbhost, $connectionInfo); - - //fill the database if needed - $query="SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'"; - $result = sqlsrv_query($connection, $query); - if($result) { - $row=sqlsrv_fetch_array($result); - } - - if(!$result or $row[0] == 0) { - OC_DB::createDbFromStructure('db_structure.xml'); - } - - sqlsrv_close($connection); + self::mssql_createDatabaseStructure($dbname, $dbuser, $dbpass); } private static function mssql_createDBLogin($name, $password, $connection) { $query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';"; $result = sqlsrv_query($connection, $query); - if ($result) { + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { $row = sqlsrv_fetch_array($result); - } - if (!$result or $row[0] == 0) { - $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + } } } private static function mssql_createDBUser($name, $dbname, $connection) { $query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';"; $result = sqlsrv_query($connection, $query); - if($result) { - $row=sqlsrv_fetch_array($result); + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + $row = sqlsrv_fetch_array($result); + + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; + $result = sqlsrv_query($connection, $query); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + + $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; + $result = sqlsrv_query($connection, $query); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } } - - if (!$result or $row[0] == 0) { - $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } - } - - $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } } private static function mssql_createDatabase($dbname, $connection) { $query = "CREATE DATABASE [".$dbname."];"; $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); } } + private static function mssql_createDatabaseStructure($dbname, $dbuser, $dbpass) { + $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); + + $connection = @sqlsrv_connect($dbhost, $connectionInfo); + + //fill the database if needed + $query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'"; + $result = sqlsrv_query($connection, $query); + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + $row = sqlsrv_fetch_array($result); + + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + OC_DB::createDbFromStructure('db_structure.xml'); + } + } + } + + sqlsrv_close($connection); + } /** * create .htaccess files for apache hosts -- GitLab From 4e5a3fbcafcaa0cdaba351dfb307b0000179c832 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 10 Feb 2013 14:08:00 +0100 Subject: [PATCH 024/353] - Fixed indentations. - Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database. --- lib/db.php | 154 ++++++++++++++++++------------------- lib/files/cache/legacy.php | 6 ++ 2 files changed, 83 insertions(+), 77 deletions(-) diff --git a/lib/db.php b/lib/db.php index c3ff481e19e..3ccd51737ae 100644 --- a/lib/db.php +++ b/lib/db.php @@ -943,95 +943,95 @@ class PDOStatementWrapper{ } } - private function tryFixSubstringLastArgumentDataForMSSQL($input) { - $query = $this->statement->queryString; - $pos = stripos ($query, 'SUBSTRING'); - - if ( $pos === false) { - return; - } - - try { - $newQuery = ''; - - $cArg = 0; - - $inSubstring = false; - - // Create new query - for ($i = 0; $i < strlen ($query); $i++) { - if ($inSubstring == false) { - // Defines when we should start inserting values - if (substr ($query, $i, 9) == 'SUBSTRING') { - $inSubstring = true; - } - } else { - // Defines when we should stop inserting values - if (substr ($query, $i, 1) == ')') { - $inSubstring = false; - } - } - - if (substr ($query, $i, 1) == '?') { - // We found a question mark - if ($inSubstring) { - $newQuery .= $input[$cArg]; - - // - // Remove from input array - // - array_splice ($input, $cArg, 1); - } else { - $newQuery .= substr ($query, $i, 1); - $cArg++; - } - } else { - $newQuery .= substr ($query, $i, 1); - } - } + private function tryFixSubstringLastArgumentDataForMSSQL($input) { + $query = $this->statement->queryString; + $pos = stripos ($query, 'SUBSTRING'); - // The global data we need - $name = OC_Config::getValue( "dbname", "owncloud" ); - $host = OC_Config::getValue( "dbhost", "" ); - $user = OC_Config::getValue( "dbuser", "" ); - $pass = OC_Config::getValue( "dbpassword", "" ); - if (strpos($host,':')) { - list($host, $port) = explode(':', $host, 2); - } else { - $port = false; - } - $opts = array(); + if ( $pos === false) { + return; + } - if ($port) { - $dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name; - } else { - $dsn = 'sqlsrv:Server='.$host.';Database='.$name; - } + try { + $newQuery = ''; - $PDO = new PDO($dsn, $user, $pass, $opts); - $PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); - $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + $cArg = 0; - $this->statement = $PDO->prepare($newQuery); + $inSubstring = false; - $this->lastArguments = $input; - - return $input; - } catch (PDOException $e){ + // Create new query + for ($i = 0; $i < strlen ($query); $i++) { + if ($inSubstring == false) { + // Defines when we should start inserting values + if (substr ($query, $i, 9) == 'SUBSTRING') { + $inSubstring = true; + } + } else { + // Defines when we should stop inserting values + if (substr ($query, $i, 1) == ')') { + $inSubstring = false; + } + } + + if (substr ($query, $i, 1) == '?') { + // We found a question mark + if ($inSubstring) { + $newQuery .= $input[$cArg]; + + // + // Remove from input array + // + array_splice ($input, $cArg, 1); + } else { + $newQuery .= substr ($query, $i, 1); + $cArg++; + } + } else { + $newQuery .= substr ($query, $i, 1); + } + } + + // The global data we need + $name = OC_Config::getValue( "dbname", "owncloud" ); + $host = OC_Config::getValue( "dbhost", "" ); + $user = OC_Config::getValue( "dbuser", "" ); + $pass = OC_Config::getValue( "dbpassword", "" ); + if (strpos($host,':')) { + list($host, $port) = explode(':', $host, 2); + } else { + $port = false; + } + $opts = array(); + + if ($port) { + $dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name; + } else { + $dsn = 'sqlsrv:Server='.$host.';Database='.$name; + } + + $PDO = new PDO($dsn, $user, $pass, $opts); + $PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); + $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + $this->statement = $PDO->prepare($newQuery); + + $this->lastArguments = $input; + + return $input; + } catch (PDOException $e){ $entry = 'PDO DB Error: "'.$e->getMessage().'"
'; $entry .= 'Offending command was: '.$this->statement->queryString .'
'; $entry .= 'Input parameters: ' .print_r($input, true).'
'; $entry .= 'Stack trace: ' .$e->getTraceAsString().'
'; OC_Log::write('core', $entry, OC_Log::FATAL); - OC_User::setUserId(null); + OC_User::setUserId(null); - // send http status 503 - header('HTTP/1.1 503 Service Temporarily Unavailable'); - header('Status: 503 Service Temporarily Unavailable'); - OC_Template::printErrorPage('Failed to connect to database'); - die ($entry); + // send http status 503 + header('HTTP/1.1 503 Service Temporarily Unavailable'); + header('Status: 503 Service Temporarily Unavailable'); + OC_Template::printErrorPage('Failed to connect to database'); + die ($entry); } - } + } /** * provide numRows diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php index 33d4b8e7c9f..bdc3cbf00b2 100644 --- a/lib/files/cache/legacy.php +++ b/lib/files/cache/legacy.php @@ -51,6 +51,12 @@ class Legacy { $this->cacheHasItems = false; return false; } + + if ($result === false || property_exists($result, 'error_message_prefix')) { + $this->cacheHasItems = false; + return false; + } + $this->cacheHasItems = (bool)$result->fetchRow(); return $this->cacheHasItems; } -- GitLab From ff09a1f37baa5ad5bd63c57ec5384e3ffbc38ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Sun, 10 Feb 2013 14:17:18 +0100 Subject: [PATCH 025/353] don't use OC_FilesystemView() --- apps/files_versions/lib/hooks.php | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index dc02c605c44..6c87eba423d 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -20,13 +20,10 @@ class Hooks { public static function write_hook( $params ) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC\Files\View('') ); - $path = $params[\OC\Files\Filesystem::signal_param_path]; - - if($path<>'') $versions->store( $path ); - + if($path<>'') { + Storage::store($path); + } } } @@ -40,12 +37,10 @@ class Hooks { */ public static function remove_hook($params) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC_FilesystemView('') ); - $path = $params[\OC\Files\Filesystem::signal_param_path]; - - if($path<>'') $versions->delete( $path ); + if($path<>'') { + Storage::delete($path); + } } } @@ -59,13 +54,11 @@ class Hooks { */ public static function rename_hook($params) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC_FilesystemView('') ); - $oldpath = $params['oldpath']; $newpath = $params['newpath']; - - if($oldpath<>'' && $newpath<>'') $versions->rename( $oldpath, $newpath ); + if($oldpath<>'' && $newpath<>'') { + Storage::rename( $oldpath, $newpath ); + } } } -- GitLab From 0c31c3cc3a928e8ca9272d32d68163c0700697ea Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 11 Feb 2013 23:46:32 +0100 Subject: [PATCH 026/353] fixing user for autotesting mssql --- autotest.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotest.cmd b/autotest.cmd index e5ea0cf4c35..a511faef9c6 100644 --- a/autotest.cmd +++ b/autotest.cmd @@ -104,7 +104,7 @@ goto:eof if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest :: we assume a sqlexpress installation - if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotext -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" + if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotest -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" :: copy autoconfig copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php -- GitLab From 808a13922c8bc002e697f3bbe84be70a2c715cf6 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 11 Feb 2013 17:55:44 -0500 Subject: [PATCH 027/353] Remove the leading slash from the filename for opendir --- apps/files_external/lib/google.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 7396c7e3f27..f9bd4075f3e 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -268,7 +268,7 @@ class Google extends \OC\Files\Storage\Common { $name .= '.'.$extension; } } - $files[] = $name; + $files[] = basename($name); // Cache entry for future use $this->entries[$name] = $entry; } -- GitLab From 6f08b1f829e9d4c49f66b19fdda8c229bc8ae3f3 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 11 Feb 2013 18:04:54 -0500 Subject: [PATCH 028/353] Change wordings --- apps/files_external/templates/settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 6f22de392fa..62bbf3a5ae1 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -6,8 +6,8 @@
- - + + '.$l->t('Applicable').''; ?> @@ -30,7 +30,7 @@ + placeholder="t('Folder name'); ?>" />
t('Mount point'); ?> t('Backend'); ?> t('Configuration'); ?>
+ + + +
t('Mount point'); ?>t('Backend'); ?>t('Folder name'); ?>t('External storage'); ?> t('Configuration'); ?> +

+ - +

-

-

-

-

-


t('use %%uid placeholder, e.g. "uid=%%uid"');?>

-


t('without any placeholder, e.g. "objectClass=person".');?>

-


t('without any placeholder, e.g. "objectClass=posixGroup".');?>

+

+

+

+

+

+

+

+

+

+ +
t('use %%uid placeholder, e.g. "uid=%%uid"');?>

+

+ +
t('without any placeholder, e.g. "objectClass=person".');?>

+

+ +
t('without any placeholder, e.g. "objectClass=posixGroup".');?>

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 7778c37c794..2b247362448 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -112,7 +112,8 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { return $ldap_users; } - // if we'd pass -1 to LDAP search, we'd end up in a Protocol error. With a limit of 0, we get 0 results. So we pass null. + // if we'd pass -1 to LDAP search, we'd end up in a Protocol + // error. With a limit of 0, we get 0 results. So we pass null. if($limit <= 0) { $limit = null; } @@ -121,9 +122,12 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { $this->getFilterPartForUserSearch($search) )); - \OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', + 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, + \OCP\Util::DEBUG); //do the search and translate results to owncloud names - $ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'), $limit, $offset); + $ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'), + $limit, $offset); $ldap_users = $this->ownCloudUserNames($ldap_users); \OCP\Util::writeLog('user_ldap', 'getUsers: '.count($ldap_users). ' Users found', \OCP\Util::DEBUG); @@ -189,11 +193,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { //check for / at the beginning or pattern c:\ resp. c:/ if( '/' == $path[0] - || (3 < strlen($path) && ctype_alpha($path[0]) && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2])) + || (3 < strlen($path) && ctype_alpha($path[0]) + && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2])) ) { $homedir = $path; } else { - $homedir = \OCP\Config::getSystemValue('datadirectory', \OC::$SERVERROOT.'/data' ) . '/' . $homedir[0]; + $homedir = \OCP\Config::getSystemValue('datadirectory', + \OC::$SERVERROOT.'/data' ) . '/' . $homedir[0]; } $this->connection->writeToCache($cacheKey, $homedir); return $homedir; @@ -267,4 +273,4 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { public function hasUserListings() { return true; } -} \ No newline at end of file +} -- GitLab From e3ba0c3082841afe84b677fdc1fc07692c5a6cd3 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 15 Feb 2013 14:46:09 +0100 Subject: [PATCH 043/353] adding a new test class for mapped local using a dot in the datadir - reflects the issue described in #1659 --- .../storage/mappedlocalwithdotteddatadir.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 tests/lib/files/storage/mappedlocalwithdotteddatadir.php diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php new file mode 100644 index 00000000000..abd0b3d85c4 --- /dev/null +++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php @@ -0,0 +1,40 @@ +. +* +*/ + +namespace Test\Files\Storage; + +class MappedLocalWithDottedDataDir extends Storage { + /** + * @var string tmpDir + */ + private $tmpDir; + public function setUp() { + $this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR; + $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); + } + + public function tearDown() { + \OC_Helper::rmdirr($this->tmpDir); + unset($this->instance); + } +} + -- GitLab From 92a36ca8b81c48565e98204e1bfdd05a23ff8bbd Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 15 Feb 2013 15:45:34 +0100 Subject: [PATCH 044/353] Join short comment lines --- apps/user_ldap/lib/access.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 32910b6e252..901299e7c21 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1054,10 +1054,8 @@ abstract class Access { $cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset); if(empty($cookie) && ($offset > 0)) { - // no cookie known, although the offset - // is not 0. Maybe cache run out. We need - // to start all over *sigh* (btw, Dear - // Reader, did you need LDAP paged + // no cookie known, although the offset is not 0. Maybe cache run out. We need + // to start all over *sigh* (btw, Dear Reader, did you need LDAP paged // searching was designed by MSFT?) $reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit; //a bit recursive, $offset of 0 is the exit -- GitLab From 925de78cec848b293266450f9b5dde85f3a9af8f Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 15 Feb 2013 15:51:55 +0100 Subject: [PATCH 045/353] Join split translated strings --- apps/user_ldap/ajax/testConfiguration.php | 3 +-- apps/user_ldap/templates/settings.php | 16 +++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index cfc07ff263e..7ce1258a796 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -36,8 +36,7 @@ if($connection->setConfiguration($_POST)) { => $l->t('The configuration is valid and the connection could be established!'))); } else { OCP\JSON::error(array('message' - => $l->t('The configuration is valid, but the Bind failed.' - .' Please check the server settings and credentials.'))); + => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'))); } } else { OCP\JSON::error(array('message' diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 43f87c076d7..a882e5b7548 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -5,13 +5,10 @@
  • Advanced
    • '.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible.' - .' You may experience unexpected behaviour.' - .' Please ask your system administrator to disable one of them.').'

    '; + echo '

    '.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'

    '; } if(!function_exists('ldap_connect')) { - echo '

    '.$l->t('Warning: The PHP LDAP module is not installed,' - .' the backend will not work. Please ask your system administrator to install it.').'

    '; + echo '

    '.$l->t('Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'

    '; } ?>
    @@ -25,16 +22,14 @@

    + title="t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>">

    + title="t('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.');?>" />

    + title="t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" />
    t('use %%uid placeholder, e.g. "uid=%%uid"');?>

    Date: Thu, 14 Feb 2013 17:57:19 +0100 Subject: [PATCH 046/353] Style cleanup files_external --- apps/files_external/lib/config.php | 20 ++++++++++++++++---- apps/files_external/lib/sftp.php | 5 +++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 44e668a09c0..fe9d62ab47f 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -310,7 +310,9 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { $content .= "\t\t'".$group."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; + $content .= "\t\t\t'".addcslashes($mountPoint, "'") + ."' => " + .str_replace("\n", '', var_export($mount, true)).", \n"; } $content .= "\t\t),\n"; @@ -322,7 +324,9 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) { $content .= "\t\t'".$user."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; + $content .= "\t\t\t'".addcslashes($mountPoint, "'") + ."' => " + .str_replace("\n", '', var_export($mount, true)).",\n"; } $content .= "\t\t),\n"; } @@ -410,8 +414,16 @@ class OC_Mount_Config { public static function checkDependencies() { $l= new OC_L10N('files_external'); $txt=''; - if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('Warning: "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'
    '; - if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('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.').'
    '; + if(!OC_Mount_Config::checksmbclient()) { + $txt.=$l->t('Warning: "smbclient" is not installed.' + .' Mounting of CIFS/SMB shares is not possible.' + .' Please ask your system administrator to install it.').'
    '; + } + if(!OC_Mount_Config::checkphpftp()) { + $txt.=$l->t('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.').'
    '; + } return($txt); } diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index 551a5a64ef2..3527f50ec98 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -7,8 +7,9 @@ */ namespace OC\Files\Storage; -set_include_path(get_include_path() . PATH_SEPARATOR . \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'); -require('Net/SFTP.php'); +set_include_path(get_include_path() . PATH_SEPARATOR . + \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'); +require 'Net/SFTP.php'; class SFTP extends \OC\Files\Storage\Common { private $host; -- GitLab From 6c197227d06d03403f335dbc23463ebf4b5f98a6 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 15 Feb 2013 15:54:51 +0100 Subject: [PATCH 047/353] Join split translated strings --- apps/files_external/lib/config.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index fe9d62ab47f..a3d1da68845 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -415,14 +415,10 @@ class OC_Mount_Config { $l= new OC_L10N('files_external'); $txt=''; if(!OC_Mount_Config::checksmbclient()) { - $txt.=$l->t('Warning: "smbclient" is not installed.' - .' Mounting of CIFS/SMB shares is not possible.' - .' Please ask your system administrator to install it.').'
    '; + $txt.=$l->t('Warning: "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'
    '; } if(!OC_Mount_Config::checkphpftp()) { - $txt.=$l->t('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.').'
    '; + $txt.=$l->t('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.').'
    '; } return($txt); -- GitLab From c0f3d8578a48ceee1a45fda4077696643747fc45 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 15 Feb 2013 17:40:07 +0100 Subject: [PATCH 048/353] folder should be created :-( --- tests/lib/files/storage/mappedlocalwithdotteddatadir.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php index abd0b3d85c4..d2e5e2e97af 100644 --- a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php +++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php @@ -27,8 +27,10 @@ class MappedLocalWithDottedDataDir extends Storage { * @var string tmpDir */ private $tmpDir; + public function setUp() { $this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR; + mkdir($this->tmpDir); $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); } -- GitLab From 191da024fa312c6322c00073c6cf48dc8e282ed0 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 15 Feb 2013 17:40:52 +0100 Subject: [PATCH 049/353] new test cases added to search in sub folders --- tests/lib/files/storage/storage.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index c74a16f509f..f78f66d8b8a 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -223,6 +223,22 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { $this->assertContains('/logo-wide.png', $result); } + public function testSearchInSubFolder() { + $this->instance->mkdir('sub') + ; + $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; + $this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r')); + $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png'; + $this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r')); + $svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg'; + $this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r')); + + $result = $this->instance->search('logo'); + $this->assertEquals(2, count($result)); + $this->assertContains('/sub/logo-wide.svg', $result); + $this->assertContains('/sub/logo-wide.png', $result); + } + public function testFOpen() { $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; -- GitLab From b488800bd5665eaa11b54002509e9e8b85c0780e Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 15 Feb 2013 17:41:22 +0100 Subject: [PATCH 050/353] fix error in recursive search --- lib/files/storage/mappedlocal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php index e707f71d71c..434c10bcbf7 100644 --- a/lib/files/storage/mappedlocal.php +++ b/lib/files/storage/mappedlocal.php @@ -20,7 +20,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ $this->datadir.='/'; } - $this->mapper= new \OC\Files\Mapper(); + $this->mapper= new \OC\Files\Mapper($this->datadir); } public function __destruct() { if (defined('PHPUNIT_RUN')) { @@ -274,7 +274,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ return $this->buildPath($path); } - protected function searchInDir($query, $dir='', $isLogicPath=true) { + protected function searchInDir($query, $dir='') { $files=array(); $physicalDir = $this->buildPath($dir); foreach (scandir($physicalDir) as $item) { @@ -287,7 +287,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ $files[]=$dir.'/'.$item; } if(is_dir($physicalItem)) { - $files=array_merge($files, $this->searchInDir($query, $physicalItem, false)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } return $files; -- GitLab From 40739350c9b674551f0b218220054ec4f303f154 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 15 Feb 2013 17:42:17 +0100 Subject: [PATCH 051/353] class Mapper no respects an unchanged physical root which will be excluded from slugifying the path --- lib/files/mapper.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index cd163dcbfcd..520fadbd8c6 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -7,6 +7,12 @@ namespace OC\Files; */ class Mapper { + private $unchangedPhysicalRoot; + + public function __construct($rootDir) { + $this->unchangedPhysicalRoot = $rootDir; + } + /** * @param string $logicPath * @param bool $create indicates if the generated physical name shall be stored in the database or not @@ -23,7 +29,7 @@ class Mapper /** * @param string $physicalPath - * @return string|null + * @return string */ public function physicalToLogic($physicalPath) { $logicPath = $this->resolvePhysicalPath($physicalPath); @@ -39,6 +45,7 @@ class Mapper * @param string $path * @param bool $isLogicPath indicates if $path is logical or physical * @param $recursive + * @return void */ public function removePath($path, $isLogicPath, $recursive) { if ($recursive) { @@ -159,14 +166,11 @@ class Mapper } private function slugifyPath($path, $index=null) { + $path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot); + $pathElements = explode('/', $path); $sluggedElements = array(); - // skip slugging the drive letter on windows - TODO: test if local path - if (\OC_Util::runningOnWindows()) { - $sluggedElements[]= $pathElements[0]; - array_shift($pathElements); - } foreach ($pathElements as $pathElement) { // remove empty elements if (empty($pathElement)) { @@ -186,12 +190,8 @@ class Mapper array_push($sluggedElements, $last.'-'.$index); } - // on non-windows systems add the leading / if necessary - if (!\OC_Util::runningOnWindows() and $path[0] === '/') { - return DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $sluggedElements); - } - - return implode(DIRECTORY_SEPARATOR, $sluggedElements); + $sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements); + return $this->stripLast($sluggedPath); } /** -- GitLab From 953c87db9cb1f58e0c79152f6603272d198dd8a0 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 15 Feb 2013 18:37:52 +0100 Subject: [PATCH 052/353] fix erroneous CSS, remove obsolete selectors --- core/css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index c2e1ad92088..8a01211d8b0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -258,8 +258,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } #expanddiv { position:absolute; right:0; top:45px; z-index:76; display:none; - background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); - background:#383c43 url('../img/noise.png') repeat; border-bottom:1px #333 solid; border-left:border-bottom:1px #333 solid; + background:#383c43 url('../img/noise.png') repeat; + border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; -moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68); } #expanddiv a { -- GitLab From 0c1ec758e89517acac8971f87e3c5796124e40ca Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 15 Feb 2013 21:49:40 +0100 Subject: [PATCH 053/353] Cache: hash long storage ids to ensure they fit in the database --- lib/files/cache/cache.php | 11 +++++++---- lib/files/mount.php | 6 ++++++ tests/lib/files/cache/cache.php | 15 +++++++++++++++ tests/lib/files/mount.php | 17 +++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 5feed37ae48..3652dc7cf23 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -48,6 +48,9 @@ class Cache { } else { $this->storageId = $storage; } + if (strlen($this->storageId) > 64) { + $this->storageId = md5($this->storageId); + } $query = \OC_DB::prepare('SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?'); $result = $query->execute(array($this->storageId)); @@ -199,7 +202,7 @@ class Cache { $valuesPlaceholder = array_fill(0, count($queryParts), '?'); $query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')' - .' VALUES(' . implode(', ', $valuesPlaceholder) . ')'); + . ' VALUES(' . implode(', ', $valuesPlaceholder) . ')'); $query->execute($params); return (int)\OC_DB::insertid('*PREFIX*filecache'); @@ -217,7 +220,7 @@ class Cache { $params[] = $id; $query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=?' - .' WHERE fileid = ?'); + . ' WHERE fileid = ?'); $query->execute($params); } @@ -335,7 +338,7 @@ class Cache { } $query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `parent` =?' - .' WHERE `fileid` = ?'); + . ' WHERE `fileid` = ?'); $query->execute(array($target, md5($target), $newParentId, $sourceId)); } @@ -496,7 +499,7 @@ class Cache { */ public function getIncomplete() { $query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`' - .' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1'); + . ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1'); $query->execute(array($this->numericId)); if ($row = $query->fetchRow()) { return $row['path']; diff --git a/lib/files/mount.php b/lib/files/mount.php index 74ee483b1be..6e99d8eabb4 100644 --- a/lib/files/mount.php +++ b/lib/files/mount.php @@ -93,6 +93,9 @@ class Mount { $this->storage = $this->createStorage(); } $this->storageId = $this->storage->getId(); + if (strlen($this->storageId) > 64) { + $this->storageId = md5($this->storageId); + } } return $this->storageId; } @@ -177,6 +180,9 @@ class Mount { * @return \OC\Files\Storage\Storage[] */ public static function findById($id) { + if (strlen($id) > 64) { + $id = md5($id); + } $result = array(); foreach (self::$mounts as $mount) { if ($mount->getStorageId() === $id) { diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php index c466fbb63e7..250842805e5 100644 --- a/tests/lib/files/cache/cache.php +++ b/tests/lib/files/cache/cache.php @@ -8,6 +8,12 @@ namespace Test\Files\Cache; +class LongId extends \OC\Files\Storage\Temporary { + public function getId() { + return 'long:' . str_repeat('foo', 50) . parent::getId(); + } +} + class Cache extends \PHPUnit_Framework_TestCase { /** * @var \OC\Files\Storage\Temporary $storage; @@ -204,6 +210,15 @@ class Cache extends \PHPUnit_Framework_TestCase { $this->assertEquals(array($storageId, 'foo'), \OC\Files\Cache\Cache::getById($id)); } + function testLongId() { + $storage = new LongId(array()); + $cache = $storage->getCache(); + $storageId = $storage->getId(); + $data = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file'); + $id = $cache->put('foo', $data); + $this->assertEquals(array(md5($storageId), 'foo'), \OC\Files\Cache\Cache::getById($id)); + } + public function tearDown() { $this->cache->clear(); } diff --git a/tests/lib/files/mount.php b/tests/lib/files/mount.php index f223f0f6c53..4e6aaf0679b 100644 --- a/tests/lib/files/mount.php +++ b/tests/lib/files/mount.php @@ -10,6 +10,12 @@ namespace Test\Files; use \OC\Files\Storage\Temporary; +class LongId extends Temporary { + public function getId() { + return 'long:' . str_repeat('foo', 50) . parent::getId(); + } +} + class Mount extends \PHPUnit_Framework_TestCase { public function setup() { \OC_Util::setupFS(); @@ -38,4 +44,15 @@ class Mount extends \PHPUnit_Framework_TestCase { $mount2 = new \OC\Files\Mount($storage, '/foo/bar'); $this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findById($id)); } + + public function testLong() { + $storage = new LongId(array()); + $mount = new \OC\Files\Mount($storage, '/foo'); + + $id = $mount->getStorageId(); + $storageId = $storage->getId(); + $this->assertEquals(array($mount), \OC\Files\Mount::findById($id)); + $this->assertEquals(array($mount), \OC\Files\Mount::findById($storageId)); + $this->assertEquals(array($mount), \OC\Files\Mount::findById(md5($storageId))); + } } -- GitLab From 83f0c8ce613eca5c384cec75c9657a95038cb90b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 16 Feb 2013 00:05:50 +0100 Subject: [PATCH 054/353] [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 1 + apps/files/l10n/de_DE.php | 1 + apps/files/l10n/es_AR.php | 1 + apps/files/l10n/gl.php | 5 +- apps/files/l10n/it.php | 1 + apps/files/l10n/ja_JP.php | 1 + apps/files/l10n/lv.php | 1 + apps/files/l10n/pt_PT.php | 1 + apps/files/l10n/sk_SK.php | 1 + apps/files/l10n/vi.php | 1 + apps/user_ldap/l10n/gl.php | 33 ++++++++- core/l10n/gl.php | 7 ++ l10n/cs_CZ/files.po | 8 +-- l10n/de_DE/files.po | 11 +-- l10n/es_AR/files.po | 9 +-- l10n/es_AR/settings.po | 12 ++-- l10n/gl/core.po | 21 +++--- l10n/gl/files.po | 12 ++-- l10n/gl/lib.po | 102 ++++++++++++++-------------- l10n/gl/user_ldap.po | 71 +++++++++---------- l10n/it/files.po | 8 +-- l10n/ja_JP/files.po | 8 +-- l10n/lv/files.po | 8 +-- l10n/pt_PT/files.po | 8 +-- l10n/pt_PT/lib.po | 24 +++---- l10n/pt_PT/settings.po | 6 +- l10n/sk_SK/files.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 | 4 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/vi/files.po | 8 +-- lib/l10n/gl.php | 22 +++++- lib/l10n/pt_PT.php | 11 ++- settings/l10n/es_AR.php | 2 + 42 files changed, 259 insertions(+), 178 deletions(-) diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 7376056e4c3..7eebd649cde 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -60,6 +60,7 @@ "Text file" => "Textový soubor", "Folder" => "Složka", "From link" => "Z odkazu", +"Deleted files" => "Odstraněné soubory", "Cancel upload" => "Zrušit odesílání", "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.", "Download" => "Stáhnout", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 0dfc19ff01b..8d119afada4 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -60,6 +60,7 @@ "Text file" => "Textdatei", "Folder" => "Ordner", "From link" => "Von einem Link", +"Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", "Download" => "Herunterladen", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index 0dc423f96f5..1e87eff9ba4 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -60,6 +60,7 @@ "Text file" => "Archivo de texto", "Folder" => "Carpeta", "From link" => "Desde enlace", +"Deleted files" => "Archivos Borrados", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!", "Download" => "Descargar", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 91896b8e39b..202f2becd36 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -17,7 +17,7 @@ "Delete" => "Eliminar", "Rename" => "Renomear", "Pending" => "Pendentes", -"{new_name} already exists" => "xa existe un {new_name}", +"{new_name} already exists" => "Xa existe un {new_name}", "replace" => "substituír", "suggest name" => "suxerir nome", "cancel" => "cancelar", @@ -60,8 +60,9 @@ "Text file" => "Ficheiro de texto", "Folder" => "Cartafol", "From link" => "Desde a ligazón", +"Deleted files" => "Ficheiros eliminados", "Cancel upload" => "Cancelar o envío", -"Nothing in here. Upload something!" => "Aquí non hai nada por aquí. Envíe algo.", +"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.", "Download" => "Descargar", "Unshare" => "Deixar de compartir", "Upload too large" => "Envío demasiado grande", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 583a0ca7f7d..33a2fbda713 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -60,6 +60,7 @@ "Text file" => "File di testo", "Folder" => "Cartella", "From link" => "Da collegamento", +"Deleted files" => "File eliminati", "Cancel upload" => "Annulla invio", "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!", "Download" => "Scarica", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 85ec6b6e953..8d1a95e243e 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -60,6 +60,7 @@ "Text file" => "テキストファイル", "Folder" => "フォルダ", "From link" => "リンク", +"Deleted files" => "削除ファイル", "Cancel upload" => "アップロードをキャンセル", "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。", "Download" => "ダウンロード", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index 9d4d2c9fb6c..30b1f4eccb1 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -60,6 +60,7 @@ "Text file" => "Teksta datne", "Folder" => "Mape", "From link" => "No saites", +"Deleted files" => "Dzēstās datnes", "Cancel upload" => "Atcelt augšupielādi", "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!", "Download" => "Lejupielādēt", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index e036b3dacbb..6f51cc6deaf 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -60,6 +60,7 @@ "Text file" => "Ficheiro de texto", "Folder" => "Pasta", "From link" => "Da ligação", +"Deleted files" => "Ficheiros eliminados", "Cancel upload" => "Cancelar envio", "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!", "Download" => "Transferir", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 8ece8140d8a..f3634af6f2e 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -60,6 +60,7 @@ "Text file" => "Textový súbor", "Folder" => "Priečinok", "From link" => "Z odkazu", +"Deleted files" => "Zmazané súbory", "Cancel upload" => "Zrušiť odosielanie", "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!", "Download" => "Stiahnuť", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index b069246f017..2c97033154b 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -60,6 +60,7 @@ "Text file" => "Tập tin văn bản", "Folder" => "Thư mục", "From link" => "Từ liên kết", +"Deleted files" => "File đã bị xóa", "Cancel upload" => "Hủy upload", "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !", "Download" => "Tải xuống", diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php index 36c1f7af114..2d07f3215ef 100644 --- a/apps/user_ldap/l10n/gl.php +++ b/apps/user_ldap/l10n/gl.php @@ -1,9 +1,24 @@ "Non foi posíbel eliminar a configuración do servidor", +"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles", "Deletion failed" => "Fallou o borrado", +"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?", +"Keep settings?" => "Manter os axustes?", +"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor", +"Connection test succeeded" => "A proba de conexión foi satisfactoria", +"Connection test failed" => "A proba de conexión fracasou", +"Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?", +"Confirm Deletion" => "Confirmar a eliminación", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Aviso: Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Aviso: O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.", +"Server configuration" => "Configuración do servidor", +"Add Server Configuration" => "Engadir a configuración do servidor", "Host" => "Servidor", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://", "Base DN" => "DN base", +"One Base DN per line" => "Un DN base por liña", "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»", "User DN" => "DN do usuario", "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." => "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros.", @@ -18,20 +33,36 @@ "Group Filter" => "Filtro de grupo", "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar cando se recompilan os grupos.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».", +"Connection Settings" => "Axustes da conexión", +"Configuration Active" => "Configuración activa", +"When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.", "Port" => "Porto", +"Backup (Replica) Host" => "Servidor da copia de seguranza (Réplica)", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.", +"Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)", +"Disable Main Server" => "Desactivar o servidor principal", +"When switched on, ownCloud will only connect to the replica server." => "Cando está activado, ownCloud só se conectará ao servidor de réplica.", "Use TLS" => "Usar TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexións LDAPS xa que fallará.", "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)", "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.", -"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud.", "Not recommended, use for testing only." => "Non se recomenda. Só para probas.", "in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.", +"Directory Settings" => "Axustes do directorio", "User Display Name Field" => "Campo de mostra do nome de usuario", "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud.", "Base User Tree" => "Base da árbore de usuarios", +"One User Base DN per line" => "Un DN base de usuario por liña", +"User Search Attributes" => "Atributos de busca do usuario", +"Optional; one attribute per line" => "Opcional; un atributo por liña", "Group Display Name Field" => "Campo de mostra do nome de grupo", "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud.", "Base Group Tree" => "Base da árbore de grupo", +"One Group Base DN per line" => "Un DN base de grupo por liña", +"Group Search Attributes" => "Atributos de busca do grupo", "Group-Member association" => "Asociación de grupos e membros", +"Special Attributes" => "Atributos especiais", "in bytes" => "en bytes", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.", "Help" => "Axuda" diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 8fd9292ce61..194c28e7cfb 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s", "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", "Object type not provided." => "Non se forneceu o tipo de obxecto.", "%s ID not provided." => "Non se forneceu o ID %s.", "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.", @@ -52,6 +53,7 @@ "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", "The required file {file} is not installed!" => "Non está instalado o ficheiro {file} que se precisa", +"Shared" => "Compartir", "Share" => "Compartir", "Error while sharing" => "Produciuse un erro ao compartir", "Error while unsharing" => "Produciuse un erro ao deixar de compartir", @@ -82,6 +84,8 @@ "Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade", "Sending ..." => "Enviando...", "Email sent" => "Correo enviado", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "A actualización non foi satisfactoria, informe deste problema á comunidade de ownCloud.", +"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.", "ownCloud password reset" => "Restabelecer o contrasinal de ownCloud", "Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}", "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal", @@ -105,6 +109,8 @@ "Security Warning" => "Aviso de seguranza", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador seguro de números ao chou podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa súa conta.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.", +"For information how to properly configure your server, please see the documentation." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a documentación.", "Create an admin account" => "Crear unha contra de administrador", "Advanced" => "Avanzado", "Data folder" => "Cartafol de datos", @@ -124,6 +130,7 @@ "Lost your password?" => "Perdeu o contrasinal?", "remember" => "lembrar", "Log in" => "Conectar", +"Alternative Logins" => "Accesos alternativos", "prev" => "anterior", "next" => "seguinte", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco." diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 3a948f28f9e..6ce25474a98 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 06:50+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,7 +277,7 @@ msgstr "Z odkazu" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Odstraněné soubory" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index c62ccc02470..f7896897c3b 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -21,6 +21,7 @@ # , 2012. # Phi Lieb <>, 2012. # Phillip Schichtel , 2013. +# , 2013. # , 2013. # , 2013. # Susi <>, 2013. @@ -31,10 +32,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 10:50+0000\n" +"Last-Translator: robN \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -298,7 +299,7 @@ msgstr "Von einem Link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Gelöschte Dateien" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 116e75e86cb..6421f04d5fb 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -6,13 +6,14 @@ # Agustin Ferrario , 2012-2013. # CJTess , 2013. # , 2012-2013. +# Javier Victor Mariano Bruno , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23:10+0000\n" +"Last-Translator: Javier Victor Mariano Bruno \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" @@ -277,7 +278,7 @@ msgstr "Desde enlace" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Archivos Borrados" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 63f5ab1289e..87ad26cb9c4 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: deftoner \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23:10+0000\n" +"Last-Translator: Javier Victor Mariano Bruno \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" @@ -165,7 +165,7 @@ msgstr "Error creando usuario" msgid "A valid password must be provided" msgstr "Debe ingresar una contraseña válida" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Castellano (Argentina)" @@ -251,7 +251,7 @@ msgstr "" msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto." #: templates/admin.php:125 msgid "Sharing" @@ -306,7 +306,7 @@ msgstr "Forzar a los clientes conectar a ownCloud vía conexión encriptada" msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL" #: templates/admin.php:192 msgid "Log" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 15c7556ce01..f67798a78e6 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -4,15 +4,16 @@ # # Translators: # antiparvos , 2012. +# , 2013. # , 2012. # Xosé M. Lamas , 2012-2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 15: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" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgstr "Sen categoría que engadir?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Esta categoría xa existe: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -256,7 +257,7 @@ msgstr "Non está instalado o ficheiro {file} que se precisa" #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "" +msgstr "Compartir" #: js/share.js:93 msgid "Share" @@ -383,11 +384,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "A actualización non foi satisfactoria, informe deste problema á comunidade de ownCloud." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud." #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -490,14 +491,14 @@ msgstr "Sen un xerador seguro de números ao chou podería acontecer que predici msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar." #: templates/installation.php:32 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a documentación." #: templates/installation.php:36 msgid "Create an admin account" @@ -580,7 +581,7 @@ msgstr "Conectar" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Accesos alternativos" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index e00e1c1134e..5fb9fb14dfd 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 14:31+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" @@ -100,7 +100,7 @@ msgstr "Pendentes" #: js/filelist.js:253 js/filelist.js:255 msgid "{new_name} already exists" -msgstr "xa existe un {new_name}" +msgstr "Xa existe un {new_name}" #: js/filelist.js:253 js/filelist.js:255 msgid "replace" @@ -277,7 +277,7 @@ msgstr "Desde a ligazón" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Ficheiros eliminados" #: templates/index.php:46 msgid "Cancel upload" @@ -285,7 +285,7 @@ msgstr "Cancelar o envío" #: templates/index.php:59 msgid "Nothing in here. Upload something!" -msgstr "Aquí non hai nada por aquí. Envíe algo." +msgstr "Aquí non hai nada. Envíe algo." #: templates/index.php:73 msgid "Download" diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index e41f414f4e8..aa47bb80329 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/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-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 15:40+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" @@ -21,27 +21,27 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "Axuda" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "Persoal" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "Configuracións" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "Usuarios" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "Aplicativos" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "Administración" @@ -51,17 +51,17 @@ msgstr "As descargas ZIP están desactivadas." #: files.php:203 msgid "Files need to be downloaded one by one." -msgstr "Os ficheiros necesitan seren descargados de un en un." +msgstr "Os ficheiros necesitan seren descargados dun en un." -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "Volver aos ficheiros" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip." -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "non foi posíbel determinalo" @@ -91,97 +91,97 @@ msgstr "Imaxes" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "Estabeleza un nome de usuario administrador" #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "Estabeleza un contrasinal de administrador" #: setup.php:40 msgid "Specify a data folder." -msgstr "" +msgstr "Especifique un cartafol de datos." #: setup.php:53 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s introduza o nome de usuario da base de datos" #: setup.php:56 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s introduza o nome da base de datos" #: setup.php:59 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s non se poden empregar puntos na base de datos" #: setup.php:62 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s estabeleza o servidor da base de datos" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "Nome de usuario e/ou contrasinal PostgreSQL incorrecto" #: setup.php:127 setup.php:150 setup.php:204 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "Deberá introducir unha conta existente ou o administrador." -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Nome de usuario e/ou contrasinal Oracle incorrecto" #: setup.php:203 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "Nome de usuario e/ou contrasinal MySQL incorrecto" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "Produciuse un erro na base de datos: «%s»" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "A orde ofensiva foi: «%s»" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "O usuario MySQL '%s'@'localhost' xa existe." -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Omitir este usuario de MySQL" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "O usuario MySQL «%s»@«%%» xa existe." -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Omitir este usuario de MySQL." -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar." -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." msgstr "Volva comprobar as guías de instalación" @@ -238,16 +238,16 @@ msgstr "último ano" msgid "years ago" msgstr "anos atrás" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s está dispoñíbel. Obtéña máis información" -#: updater.php:77 +#: updater.php:81 msgid "up to date" -msgstr "ao día" +msgstr "actualizado" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "a comprobación de actualizacións está desactivada" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index 62e23bcad3c..af16ecd286b 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2013. # , 2012. # Miguel Branco, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 12:47+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 20:40+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" @@ -21,23 +22,23 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Non foi posíbel eliminar a configuración do servidor" #: ajax/testConfiguration.php:35 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "A configuración é correcta e pode estabelecerse a conexión." #: ajax/testConfiguration.php:37 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais." #: ajax/testConfiguration.php:40 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles" #: js/settings.js:66 msgid "Deletion failed" @@ -45,31 +46,31 @@ msgstr "Fallou o borrado" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Tomar os recentes axustes de configuración do servidor?" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Manter os axustes?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Non é posíbel engadir a configuración do servidor" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "A proba de conexión foi satisfactoria" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "A proba de conexión fracasou" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Confirma que quere eliminar a configuración actual do servidor?" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Confirmar a eliminación" #: templates/settings.php:8 msgid "" @@ -82,15 +83,15 @@ msgstr "Aviso: Os aplicativos user_ldap e user_webdavauth son incompatíb msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "" +msgstr "Aviso: O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo." #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Configuración do servidor" #: templates/settings.php:17 msgid "Add Server Configuration" -msgstr "" +msgstr "Engadir a configuración do servidor" #: templates/settings.php:21 msgid "Host" @@ -107,7 +108,7 @@ msgstr "DN base" #: templates/settings.php:22 msgid "One Base DN per line" -msgstr "" +msgstr "Un DN base por liña" #: templates/settings.php:22 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -174,15 +175,15 @@ msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»." #: templates/settings.php:31 msgid "Connection Settings" -msgstr "" +msgstr "Axustes da conexión" #: templates/settings.php:33 msgid "Configuration Active" -msgstr "" +msgstr "Configuración activa" #: templates/settings.php:33 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Se está sen marcar, omítese esta configuración." #: templates/settings.php:34 msgid "Port" @@ -190,25 +191,25 @@ msgstr "Porto" #: templates/settings.php:35 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Servidor da copia de seguranza (Réplica)" #: templates/settings.php:35 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD." #: templates/settings.php:36 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Porto da copia de seguranza (Réplica)" #: templates/settings.php:37 msgid "Disable Main Server" -msgstr "" +msgstr "Desactivar o servidor principal" #: templates/settings.php:37 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica." #: templates/settings.php:38 msgid "Use TLS" @@ -216,7 +217,7 @@ msgstr "Usar TLS" #: templates/settings.php:38 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará." #: templates/settings.php:39 msgid "Case insensitve LDAP server (Windows)" @@ -230,7 +231,7 @@ msgstr "Desactiva a validación do certificado SSL." msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud." +msgstr "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud." #: templates/settings.php:40 msgid "Not recommended, use for testing only." @@ -242,7 +243,7 @@ msgstr "en segundos. Calquera cambio baleira a caché." #: templates/settings.php:43 msgid "Directory Settings" -msgstr "" +msgstr "Axustes do directorio" #: templates/settings.php:45 msgid "User Display Name Field" @@ -258,15 +259,15 @@ msgstr "Base da árbore de usuarios" #: templates/settings.php:46 msgid "One User Base DN per line" -msgstr "" +msgstr "Un DN base de usuario por liña" #: templates/settings.php:47 msgid "User Search Attributes" -msgstr "" +msgstr "Atributos de busca do usuario" #: templates/settings.php:47 templates/settings.php:50 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Opcional; un atributo por liña" #: templates/settings.php:48 msgid "Group Display Name Field" @@ -282,11 +283,11 @@ msgstr "Base da árbore de grupo" #: templates/settings.php:49 msgid "One Group Base DN per line" -msgstr "" +msgstr "Un DN base de grupo por liña" #: templates/settings.php:50 msgid "Group Search Attributes" -msgstr "" +msgstr "Atributos de busca do grupo" #: templates/settings.php:51 msgid "Group-Member association" @@ -294,7 +295,7 @@ msgstr "Asociación de grupos e membros" #: templates/settings.php:53 msgid "Special Attributes" -msgstr "" +msgstr "Atributos especiais" #: templates/settings.php:56 msgid "in bytes" diff --git a/l10n/it/files.po b/l10n/it/files.po index 1a3e8db783b..001d45a4bea 100644 --- a/l10n/it/files.po +++ b/l10n/it/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23: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" @@ -278,7 +278,7 @@ msgstr "Da collegamento" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "File eliminati" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 21ebd3c48b2..17180fdddcb 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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 01: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" @@ -279,7 +279,7 @@ msgstr "リンク" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "削除ファイル" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index e17afcc1853..e51491eec5d 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 13:00+0000\n" +"Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,7 +277,7 @@ msgstr "No saites" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Dzēstās datnes" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 1e85d6184d7..97c80512770 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23:10+0000\n" +"Last-Translator: Mouxy \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" @@ -282,7 +282,7 @@ msgstr "Da ligação" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Ficheiros eliminados" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index 5aad6742ac0..9d3cdd6e61e 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 23:06+0000\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23:10+0000\n" "Last-Translator: Mouxy \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgstr "%s defina o servidor da base de dados (geralmente localhost)" #: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" -msgstr "Nome de utilizador/passwor do PostgreSQL inválido" +msgstr "Nome de utilizador/password do PostgreSQL inválido" #: setup.php:127 setup.php:150 setup.php:204 msgid "You need to enter either an existing account or the administrator." @@ -130,11 +130,11 @@ msgstr "Precisa de introduzir uma conta existente ou de administrador" #: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Nome de utilizador/password do Oracle inválida" #: setup.php:203 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "Nome de utilizador/password do MySQL inválida" #: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 #: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 @@ -142,37 +142,37 @@ msgstr "" #: setup.php:584 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "Erro na BD: \"%s\"" #: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 #: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 #: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "O comando gerador de erro foi: \"%s\"" #: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "O utilizador '%s'@'localhost' do MySQL já existe." #: setup.php:274 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Eliminar este utilizador do MySQL" #: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "O utilizador '%s'@'%%' do MySQL já existe" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Eliminar este utilizador do MySQL" #: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s" #: setup.php:649 msgid "" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index e1dc13b05bd..03a761e64fb 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 23:03+0000\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-14 23:10+0000\n" "Last-Translator: Mouxy \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -169,7 +169,7 @@ msgstr "Erro a criar utilizador" msgid "A valid password must be provided" msgstr "Uma password válida deve ser fornecida" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__language_name__" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 8893c32c437..a290cd58f67 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 06:10+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -280,7 +280,7 @@ msgstr "Z odkazu" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Zmazané súbory" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 0cc8a3019e8..2822af0fa6c 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 078e0e40585..fd84b8854b0 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 6d0396470cb..f3a9c41f44f 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index db270559083..b1555b2cfec 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 27454624e29..078d6a894d5 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index dfb76494588..ca7dd1f208c 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index bbfa7fc167b..56ffebb83ee 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 40dc2bee040..b1b060a1e29 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index afd2407497c..1c27a1ae28d 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -161,7 +161,7 @@ msgstr "" msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 0a173656b5e..29a637c80d9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 0b84d4999f6..59d943daf4f 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index d7eaa300bd9..ec785055c6b 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"PO-Revision-Date: 2013-02-15 20:30+0000\n" +"Last-Translator: saosangm \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +279,7 @@ msgstr "Từ liên kết" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "File đã bị xóa" #: templates/index.php:46 msgid "Cancel upload" diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index c49e8134af1..9673bb65fc1 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -6,7 +6,7 @@ "Apps" => "Aplicativos", "Admin" => "Administración", "ZIP download is turned off." => "As descargas ZIP están desactivadas.", -"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados de un en un.", +"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.", "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.", "couldn't be determined" => "non foi posíbel determinalo", @@ -16,6 +16,24 @@ "Files" => "Ficheiros", "Text" => "Texto", "Images" => "Imaxes", +"Set an admin username." => "Estabeleza un nome de usuario administrador", +"Set an admin password." => "Estabeleza un contrasinal de administrador", +"Specify a data folder." => "Especifique un cartafol de datos.", +"%s enter the database username." => "%s introduza o nome de usuario da base de datos", +"%s enter the database name." => "%s introduza o nome da base de datos", +"%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos", +"%s set the database host." => "%s estabeleza o servidor da base de datos", +"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal PostgreSQL incorrecto", +"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.", +"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal Oracle incorrecto", +"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal MySQL incorrecto", +"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»", +"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»", +"MySQL user '%s'@'localhost' exists already." => "O usuario MySQL '%s'@'localhost' xa existe.", +"Drop this user from MySQL" => "Omitir este usuario de MySQL", +"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.", +"Drop this user from MySQL." => "Omitir este usuario de MySQL.", +"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.", "Please double check the installation guides." => "Volva comprobar as guías de instalación", "seconds ago" => "segundos atrás", @@ -31,7 +49,7 @@ "last year" => "último ano", "years ago" => "anos atrás", "%s is available. Get more information" => "%s está dispoñíbel. Obtéña máis información", -"up to date" => "ao día", +"up to date" => "actualizado", "updates check is disabled" => "a comprobación de actualizacións está desactivada", "Could not find category \"%s\"" => "Non foi posíbel atopar a categoría «%s»" ); diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index a3585f914da..9bdcfcc9ced 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -23,8 +23,17 @@ "%s enter the database name." => "%s introduza o nome da base de dados", "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados", "%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)", -"PostgreSQL username and/or password not valid" => "Nome de utilizador/passwor do PostgreSQL inválido", +"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido", "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador", +"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida", +"MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida", +"DB Error: \"%s\"" => "Erro na BD: \"%s\"", +"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL já existe.", +"Drop this user from MySQL" => "Eliminar este utilizador do MySQL", +"MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe", +"Drop this user from MySQL." => "Eliminar este utilizador do MySQL", +"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s", "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" => "há alguns segundos", diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index d5e054a14dc..1e122bdd45a 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -47,6 +47,7 @@ "Internet connection not working" => "La conexión a Internet no esta funcionando. ", "Cron" => "Cron", "Execute one task with each page loaded" => "Ejecute una tarea con cada pagina cargada.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un 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 +60,7 @@ "Security" => "Seguridad", "Enforce HTTPS" => "Forzar HTTPS", "Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL", "Log" => "Log", "Log level" => "Nivel de Log", "More" => "Más", -- GitLab From 46626915ef6888c958111b259ae6c0d3729b5198 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Feb 2013 01:30:44 +0100 Subject: [PATCH 055/353] Use a parser to read custom mount configuration instead of including the php files --- apps/files_external/lib/config.php | 3 +- lib/arrayparser.php | 189 +++++++++++++++++++++++++++++ lib/files/filesystem.php | 16 +-- 3 files changed, 200 insertions(+), 8 deletions(-) create mode 100644 lib/arrayparser.php diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 44e668a09c0..6ef7f37f58b 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -279,13 +279,14 @@ class OC_Mount_Config { * @return array */ private static function readData($isPersonal) { + $parser = new \OC\ArrayParser(); if ($isPersonal) { $file = OC_User::getHome(OCP\User::getUser()).'/mount.php'; } else { $file = OC::$SERVERROOT.'/config/mount.php'; } if (is_file($file)) { - $mountPoints = include $file; + $mountPoints = $parser->parsePHP(file_get_contents($file)); if (is_array($mountPoints)) { return $mountPoints; } diff --git a/lib/arrayparser.php b/lib/arrayparser.php new file mode 100644 index 00000000000..3bb394a5163 --- /dev/null +++ b/lib/arrayparser.php @@ -0,0 +1,189 @@ +. + * + */ + +namespace OC; + +class SyntaxException extends \Exception { +} + +class ArrayParser { + const TYPE_NUM = 1; + const TYPE_BOOL = 2; + const TYPE_STRING = 3; + const TYPE_ARRAY = 4; + + function parsePHP($string) { + $string = $this->stripPHPTags($string); + $string = $this->stripAssignAndReturn($string); + return $this->parse($string); + } + + function stripPHPTags($string) { + $string = trim($string); + if (substr($string, 0, 5) === '') { + $string = substr($string, 0, -2); + } + return $string; + } + + function stripAssignAndReturn($string) { + $string = trim($string); + if (substr($string, 0, 6) === 'return') { + $string = substr($string, 6); + } + if (substr($string, 0, 1) === '$') { + list(, $string) = explode('=', $string, 2); + } + return $string; + } + + function parse($string) { + $string = trim($string); + $string = trim($string, ';'); + switch ($this->getType($string)) { + case self::TYPE_NUM: + return $this->parseNum($string); + case self::TYPE_BOOL: + return $this->parseBool($string); + case self::TYPE_STRING: + return $this->parseString($string); + case self::TYPE_ARRAY: + return $this->parseArray($string); + } + return null; + } + + function getType($string) { + $string = strtolower($string); + $first = substr($string, 0, 1); + $last = substr($string, -1, 1); + $arrayFirst = substr($string, 0, 5); + if (($first === '"' or $first === "'") and ($last === '"' or $last === "'")) { + return self::TYPE_STRING; + } elseif ($string === 'false' or $string === 'true') { + return self::TYPE_BOOL; + } elseif ($arrayFirst === 'array' and $last === ')') { + return self::TYPE_ARRAY; + } else { + return self::TYPE_NUM; + } + } + + function parseString($string) { + return substr($string, 1, -1); + } + + function parseNum($string) { + return intval($string); + } + + function parseBool($string) { + $string = strtolower($string); + return $string === 'true'; + } + + function parseArray($string) { + $body = substr($string, 5); + $body = trim($body); + $body = substr($body, 1, -1); + $items = $this->splitArray($body); + $result = array(); + $lastKey = -1; + foreach ($items as $item) { + $item = trim($item); + if ($item) { + if (strpos($item, '=>')) { + list($key, $value) = explode('=>', $item, 2); + $key = $this->parse($key); + $value = $this->parse($value); + } else { + $key = ++$lastKey; + $value = $item; + } + + if (is_numeric($key)) { + $lastKey = $key; + } + $result[$key] = $value; + } + } + return $result; + } + + function splitArray($body) { + $inSingleQuote = false;//keep track if we are inside quotes + $inDoubleQuote = false; + $bracketDepth = 0;//keep track if we are inside brackets + $parts = array(); + $start = 0; + $escaped = false;//keep track if we are after an escape character + $skips = array();//keep track of the escape characters we need to remove from the result + if (substr($body, -1, 1) !== ',') { + $body .= ','; + } + for ($i = 0; $i < strlen($body); $i++) { + $char = substr($body, $i, 1); + if ($char === '\\') { + if ($escaped) { + array_unshift($skips, $i - 1); + } + $escaped = !$escaped; + } else { + if ($char === '"' and !$inSingleQuote) { + if ($escaped) { + array_unshift($skips, $i - 1); + } else { + $inDoubleQuote = !$inDoubleQuote; + } + } elseif ($char === "'" and !$inDoubleQuote) { + if ($escaped) { + array_unshift($skips, $i - 1); + } else { + $inSingleQuote = !$inSingleQuote; + } + } elseif (!$inDoubleQuote and !$inSingleQuote) { + if ($char === '(') { + $bracketDepth++; + } elseif ($char === ')') { + if ($bracketDepth <= 0) { + throw new SyntaxException; + } else { + $bracketDepth--; + } + } elseif ($bracketDepth === 0 and $char === ',') { + $part = substr($body, $start, $i - $start); + foreach ($skips as $skip) { + $part = substr($part, 0, $skip - $start) . substr($part, $skip - $start + 1); + } + $parts[] = $part; + $start = $i + 1; + $skips = array(); + } + } + $escaped = false; + } + } + return $parts; + } +} diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index f4530868077..89a9ab29212 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -215,9 +215,11 @@ class Filesystem { if ($user == '') { $user = \OC_User::getUser(); } + $parser = new \OC\ArrayParser(); + // Load system mount points if (is_file(\OC::$SERVERROOT . '/config/mount.php')) { - $mountConfig = include 'config/mount.php'; + $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); if (isset($mountConfig['global'])) { foreach ($mountConfig['global'] as $mountPoint => $options) { self::mount($options['class'], $options['options'], $mountPoint); @@ -254,7 +256,7 @@ class Filesystem { $root = \OC_User::getHome($user); self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); if (is_file($root . '/mount.php')) { - $mountConfig = include $root . '/mount.php'; + $mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php')); if (isset($mountConfig['user'][$user])) { foreach ($mountConfig['user'][$user] as $mountPoint => $options) { self::mount($options['class'], $options['options'], $mountPoint); @@ -613,11 +615,11 @@ class Filesystem { } /** - * Get the owner for a file or folder - * - * @param string $path - * @return string - */ + * Get the owner for a file or folder + * + * @param string $path + * @return string + */ public static function getOwner($path) { return self::$defaultInstance->getOwner($path); } -- GitLab From 6da2c6c83e48fc3c7f8dd0814fe815d2b772f6eb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Feb 2013 01:50:40 +0100 Subject: [PATCH 056/353] Create new mountconfig files in json --- apps/files_external/lib/config.php | 45 ++++++++++-------------------- lib/files/filesystem.php | 16 ++++++++--- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 6ef7f37f58b..36ef48462a7 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -281,12 +281,19 @@ class OC_Mount_Config { private static function readData($isPersonal) { $parser = new \OC\ArrayParser(); if ($isPersonal) { - $file = OC_User::getHome(OCP\User::getUser()).'/mount.php'; + $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; + $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $file = OC::$SERVERROOT.'/config/mount.php'; + $phpFile = OC::$SERVERROOT.'/config/mount.php'; + $jsonFile = OC::$SERVERROOT.'/config/mount.json'; } - if (is_file($file)) { - $mountPoints = $parser->parsePHP(file_get_contents($file)); + if (is_file($jsonFile)) { + $mountPoints = json_decode(file_get_contents($jsonFile), true); + if (is_array($mountPoints)) { + return $mountPoints; + } + } elseif (is_file($phpFile)) { + $mountPoints = $parser->parsePHP(file_get_contents($phpFile)); if (is_array($mountPoints)) { return $mountPoints; } @@ -301,35 +308,11 @@ class OC_Mount_Config { */ private static function writeData($isPersonal, $data) { if ($isPersonal) { - $file = OC_User::getHome(OCP\User::getUser()).'/mount.php'; + $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $file = OC::$SERVERROOT.'/config/mount.php'; - } - $content = " array (\n"; - foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { - $content .= "\t\t'".$group."' => array (\n"; - foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; - - } - $content .= "\t\t),\n"; - } - $content .= "\t),\n"; - } - if (isset($data[self::MOUNT_TYPE_USER])) { - $content .= "\t'user' => array (\n"; - foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) { - $content .= "\t\t'".$user."' => array (\n"; - foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; - } - $content .= "\t\t),\n"; - } - $content .= "\t),\n"; + $file = OC::$SERVERROOT.'/config/mount.json'; } - $content .= ");\n?>"; + $content = json_encode($data); @file_put_contents($file, $content); } diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 89a9ab29212..cba469e06c4 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -218,8 +218,12 @@ class Filesystem { $parser = new \OC\ArrayParser(); // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php')) { - $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) { + if(is_file(\OC::$SERVERROOT . '/config/mount.json')){ + $mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true); + }elseif(is_file(\OC::$SERVERROOT . '/config/mount.php')){ + $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); + } if (isset($mountConfig['global'])) { foreach ($mountConfig['global'] as $mountPoint => $options) { self::mount($options['class'], $options['options'], $mountPoint); @@ -255,8 +259,12 @@ class Filesystem { // Load personal mount points $root = \OC_User::getHome($user); self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); - if (is_file($root . '/mount.php')) { - $mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php')); + if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) { + if (is_file($root . '/mount.json')){ + $mountConfig = json_decode(file_get_contents($root . '/mount.json'), true); + } elseif (is_file($root . '/mount.php')){ + $mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php')); + } if (isset($mountConfig['user'][$user])) { foreach ($mountConfig['user'][$user] as $mountPoint => $options) { self::mount($options['class'], $options['options'], $mountPoint); -- GitLab From bef48bad8b83b2826d6eb3397e3f22e8d20ba5f3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sat, 16 Feb 2013 02:06:45 +0100 Subject: [PATCH 057/353] LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727 --- apps/user_ldap/user_ldap.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 7778c37c794..50effd79c1f 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -221,7 +221,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { $this->connection->ldapUserDisplayName); if($displayName && (count($displayName) > 0)) { - $this->connection->writeToCache($cacheKey, $displayName); + $this->connection->writeToCache($cacheKey, $displayName[0]); return $displayName[0]; } @@ -258,7 +258,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions); + return (bool)((OC_USER_BACKEND_CHECK_PASSWORD + | OC_USER_BACKEND_GET_HOME + | OC_USER_BACKEND_GET_DISPLAYNAME) + & $actions); } /** -- GitLab From a28df74ee593481e869a74e9a84e4e20aad293eb Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sat, 16 Feb 2013 02:33:19 +0100 Subject: [PATCH 058/353] LDAP: check array with isset first to avoid warnings about undefined index --- apps/user_ldap/lib/connection.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 0bf2efe35af..7ed3f3afe90 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -295,7 +295,8 @@ class Connection { foreach($config as $parameter => $value) { if(($parameter == 'homeFolderNamingRule' - || $params[$parameter] == 'homeFolderNamingRule') + || (isset($params[$parameter]) + && $params[$parameter] == 'homeFolderNamingRule')) && !empty($value)) { $value = 'attr:'.$value; } -- GitLab From d96146a017bd8f7e4573e4555cea2c198fa9fbad Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Feb 2013 03:27:50 +0100 Subject: [PATCH 059/353] Give storage backends the option to define having no known free space When this is the case only the configured max upload size is taking into account for uploading --- apps/files/ajax/upload.php | 2 +- apps/files_external/lib/amazons3.php | 5 ----- apps/files_external/lib/sftp.php | 4 ---- apps/files_external/lib/streamwrapper.php | 4 ---- apps/files_external/lib/swift.php | 4 ---- apps/files_external/lib/webdav.php | 2 +- lib/files/filesystem.php | 2 ++ lib/files/storage/common.php | 9 +++++++++ lib/helper.php | 8 ++++++-- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 07977f5ddf1..9031c729eff 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -48,7 +48,7 @@ $totalSize = 0; foreach ($files['size'] as $size) { $totalSize += $size; } -if ($totalSize > \OC\Files\Filesystem::free_space($dir)) { +if ($totalSize > $maxUploadFilesize) { OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'), 'uploadMaxFilesize' => $maxUploadFilesize, 'maxHumanFilesize' => $maxHumanFilesize))); diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 494885a1dd3..37e53a3a670 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -229,11 +229,6 @@ class AmazonS3 extends \OC\Files\Storage\Common { return false; } - public function free_space($path) { - // Infinite? - return false; - } - public function touch($path, $mtime = null) { if (is_null($mtime)) { $mtime = time(); diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index 551a5a64ef2..77c08d3b733 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -241,10 +241,6 @@ class SFTP extends \OC\Files\Storage\Common { } } - public function free_space($path) { - return -1; - } - public function touch($path, $mtime=null) { try { if (!is_null($mtime)) return false; diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index a631e7ce06a..4685877f26b 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -76,10 +76,6 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{ return fopen($this->constructUrl($path), $mode); } - public function free_space($path) { - return 0; - } - public function touch($path, $mtime=null) { $this->init(); if(is_null($mtime)) { diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 0fd6fa143b8..a00316c1f84 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -478,10 +478,6 @@ class SWIFT extends \OC\Files\Storage\Common{ } } - public function free_space($path) { - return 1024*1024*1024*8; - } - public function touch($path, $mtime=null) { $this->init(); $obj=$this->getObject($path); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 039a07b1ef2..91cc22779e6 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -222,7 +222,7 @@ class DAV extends \OC\Files\Storage\Common{ return 0; } } catch(\Exception $e) { - return 0; + return \OC\Files\FREE_SPACE_UNKNOWN; } } diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index f4530868077..0dafef836bd 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -29,6 +29,8 @@ namespace OC\Files; +const FREE_SPACE_UNKNOWN = -2; + class Filesystem { public static $loaded = false; /** diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 4cdabf1c8a6..4e7a73e5d4a 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -301,4 +301,13 @@ abstract class Common implements \OC\Files\Storage\Storage { } return implode('/', $output); } + + /** + * get the free space in the storage + * @param $path + * return int + */ + public function free_space($path){ + return \OC\Files\FREE_SPACE_UNKNOWN; + } } diff --git a/lib/helper.php b/lib/helper.php index 0f810ffc0c2..add5c66e7be 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -762,9 +762,13 @@ class OC_Helper { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); $freeSpace = \OC\Files\Filesystem::free_space($dir); - $freeSpace = max($freeSpace, 0); + if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){ + $freeSpace = max($freeSpace, 0); - return min($maxUploadFilesize, $freeSpace); + return min($maxUploadFilesize, $freeSpace); + } else { + return $maxUploadFilesize; + } } /** -- GitLab From e1700c28fa879afe6bc63a91e3f426fb4bb5b7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Sat, 16 Feb 2013 12:10:54 +0100 Subject: [PATCH 060/353] pretty print json --- apps/files_external/lib/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 36ef48462a7..81c01eb3d0a 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -312,7 +312,7 @@ class OC_Mount_Config { } else { $file = OC::$SERVERROOT.'/config/mount.json'; } - $content = json_encode($data); + $content = json_encode($data, JSON_PRETTY_PRINTy print json); @file_put_contents($file, $content); } -- GitLab From cad65915a7c5b8df10ebbe27064a8012b9a79e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Sat, 16 Feb 2013 12:55:36 +0100 Subject: [PATCH 061/353] look where you are typing ... --- apps/files_external/lib/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 81c01eb3d0a..e49d52ebc79 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -312,7 +312,7 @@ class OC_Mount_Config { } else { $file = OC::$SERVERROOT.'/config/mount.json'; } - $content = json_encode($data, JSON_PRETTY_PRINTy print json); + $content = json_encode($data, JSON_PRETTY_PRINT); @file_put_contents($file, $content); } -- GitLab From 4708d4549d5574e39dfd18c722941b5512cabc89 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 16 Feb 2013 13:28:49 +0100 Subject: [PATCH 062/353] Add missing requesttoken This is a trivial fix for a regression caused by #1648 --- apps/files_external/templates/settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index df8d7d6e2b5..d7a4dd5150d 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -149,6 +149,7 @@

    + -- GitLab From 5a8e0f2048d6b2ef1d271fc8ca05c6d5bd338aed Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sat, 16 Feb 2013 19:56:56 +0100 Subject: [PATCH 063/353] Extra position check for multiselect dropdown. Fix app/issues/575 --- core/js/multiselect.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 623c6e0f7e1..bc4223feb64 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -266,8 +266,9 @@ } list.append(list.find('li.creator')); var pos=button.position(); - if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) - || $(document).height()/2 > pos.top + if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) + && $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) + || $(document).height()/2 > button.offset().top ) { list.css({ top:pos.top+button.outerHeight()-5, -- GitLab From 50759607e4a94c63ae02bf6302acd191913bc834 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sat, 16 Feb 2013 17:42:06 -0500 Subject: [PATCH 064/353] add file_exists method to files_trashbin app --- apps/files_trashbin/lib/trash.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index d88dc1ac252..8cb44d0a684 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -246,8 +246,19 @@ class Trashbin { return $size; } - - + + /** + * check to see whether a file exists in trashbin + * @param $file path to the file to check + * @return true if file exists, otherwise false + */ + public static function file_exists($file) { + $user = \OCP\User::getUser(); + $view = new \OC_FilesystemView('/'.$user); + $target = \OC_Filesystem::normalizePath('files_trashbin/'.$file); + return $view->file_exists($target); + } + /** * clean up the trash bin * @param max. available disk space for trashbin -- GitLab From 4b4b1f86925248a36c4cc62e91905e605b891e70 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sat, 16 Feb 2013 17:44:51 -0500 Subject: [PATCH 065/353] Properly delete empty directories in Trashbin Instead of checking delted file size, we do a real check. this fixes #1688 --- apps/files_trashbin/ajax/delete.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7a6bd1342ea..f41482bef55 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -15,7 +15,9 @@ if ($path_parts['dirname'] == '.') { $timestamp = null; } -if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { +OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); + +if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { OCP\JSON::success(array("data" => array("filename" => $file))); } else { $l = OC_L10N::get('files_trashbin'); -- GitLab From c8e7b14ab38bf7d630a4cac9091ba134a427f068 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 17 Feb 2013 00:26:17 +0100 Subject: [PATCH 066/353] [tx-robot] updated from transifex --- apps/files/l10n/ca.php | 1 + apps/files/l10n/fi_FI.php | 1 + apps/files/l10n/ru.php | 1 + apps/files_encryption/l10n/de_DE.php | 4 +-- apps/files_trashbin/l10n/de_DE.php | 4 +-- apps/files_versions/l10n/de_DE.php | 4 +-- apps/user_ldap/l10n/de_DE.php | 28 +++++++++---------- apps/user_webdavauth/l10n/de_DE.php | 2 +- core/l10n/be.php | 6 +++++ core/l10n/de_DE.php | 32 +++++++++++----------- l10n/be/core.po | 15 ++++++----- l10n/ca/files.po | 8 +++--- l10n/de_DE/core.po | 40 ++++++++++++++-------------- l10n/de_DE/files.po | 6 ++--- l10n/de_DE/files_encryption.po | 12 ++++----- l10n/de_DE/files_trashbin.po | 13 ++++----- l10n/de_DE/files_versions.po | 12 ++++----- l10n/de_DE/lib.po | 6 ++--- l10n/de_DE/settings.po | 28 +++++++++---------- l10n/de_DE/user_ldap.po | 36 ++++++++++++------------- l10n/de_DE/user_webdavauth.po | 13 ++++----- l10n/fi_FI/files.po | 8 +++--- l10n/fr/settings.po | 38 +++++++++++++------------- l10n/ru/files.po | 8 +++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 4 +-- 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 +- settings/l10n/de_DE.php | 10 +++++-- settings/l10n/fr.php | 10 +++++++ 37 files changed, 199 insertions(+), 171 deletions(-) create mode 100644 core/l10n/be.php diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index ecfc6abc8d5..5869b7df8ce 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -60,6 +60,7 @@ "Text file" => "Fitxer de text", "Folder" => "Carpeta", "From link" => "Des d'enllaç", +"Deleted files" => "Fitxers esborrats", "Cancel upload" => "Cancel·la la pujada", "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!", "Download" => "Baixa", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 81ac32c09f3..ba6e3ecb4a4 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -54,6 +54,7 @@ "Text file" => "Tekstitiedosto", "Folder" => "Kansio", "From link" => "Linkistä", +"Deleted files" => "Poistetut tiedostot", "Cancel upload" => "Peru lähetys", "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!", "Download" => "Lataa", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 803b34e99c8..7bfd93c9e47 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -60,6 +60,7 @@ "Text file" => "Текстовый файл", "Folder" => "Папка", "From link" => "Из ссылки", +"Deleted files" => "Удалённые файлы", "Cancel upload" => "Отмена загрузки", "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!", "Download" => "Скачать", diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php index b942c659f9e..4f08b98eb29 100644 --- a/apps/files_encryption/l10n/de_DE.php +++ b/apps/files_encryption/l10n/de_DE.php @@ -1,7 +1,7 @@ "Verschlüsselung", "File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert", -"The following file types will not be encrypted:" => "Die folgenden Datei-Typen werden nicht verschlüsselt:", -"Exclude the following file types from encryption:" => "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:", +"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:", +"Exclude the following file types from encryption:" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:", "None" => "Keine" ); diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 7cb1834141b..6d944b3580c 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -1,7 +1,7 @@ "Konnte %s nicht permanent löschen", +"Couldn't delete %s permanently" => "Konnte %s nicht entgültig löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", -"perform restore operation" => "Führe die Wiederherstellung aus", +"perform restore operation" => "Wiederherstellung ausführen", "delete file permanently" => "Datei entgültig löschen", "Name" => "Name", "Deleted" => "Gelöscht", diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php index 1cf2a63a1de..ba849c5ea87 100644 --- a/apps/files_versions/l10n/de_DE.php +++ b/apps/files_versions/l10n/de_DE.php @@ -4,10 +4,10 @@ "File %s was reverted to version %s" => "Die Datei %s wurde zur Version %s zurückgesetzt", "failure" => "Fehlgeschlagen", "File %s could not be reverted to version %s" => "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden", -"No old versions available" => "keine älteren Versionen verfügbar", +"No old versions available" => "Keine älteren Versionen verfügbar", "No path specified" => "Kein Pfad angegeben", "History" => "Historie", -"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück", +"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück", "Files Versioning" => "Dateiversionierung", "Enable" => "Aktivieren" ); diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 69faf5dc45d..45edda2debb 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -1,20 +1,20 @@ "Das Löschen der Server-Konfiguration schlug fehl", -"The configuration is valid and the connection could be established!" => "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!", -"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist valide, aber das Herstellen einer Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.", -"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen.", +"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 das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen.", "Deletion failed" => "Löschen fehlgeschlagen", -"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?", +"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?", "Keep settings?" => "Einstellungen behalten?", -"Cannot add server configuration" => "Das Hinzufügen der Server-Konfiguration schlug fehl", -"Connection test succeeded" => "Verbindungs-Test erfolgreich", -"Connection test failed" => "Verbindungs-Test fehlgeschlagen", -"Do you really want to delete the current Server Configuration?" => "Möchten Sie wirklich die Server-Konfiguration löschen?", +"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl", +"Connection test succeeded" => "Verbindungstest erfolgreich", +"Connection test failed" => "Verbindungstest fehlgeschlagen", +"Do you really want to delete the current Server Configuration?" => "Möchten Sie die Serverkonfiguration wirklich löschen?", "Confirm Deletion" => "Löschung bestätigen", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. 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 ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", -"Server configuration" => "Server-Konfiguration", -"Add Server Configuration" => "Server-Konfiguration hinzufügen", +"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, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://", "Base DN" => "Basis-DN", @@ -33,7 +33,7 @@ "Group Filter" => "Gruppen-Filter", "Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"", -"Connection Settings" => "Verbindungs-Einstellungen", +"Connection Settings" => "Verbindungseinstellungen", "Configuration Active" => "Konfiguration aktiv", "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", "Port" => "Port", @@ -41,7 +41,7 @@ "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein.", "Backup (Replica) Port" => "Back-Up (Replikation) Port", "Disable Main Server" => "Hauptserver deaktivieren", -"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden.", +"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden.", "Use TLS" => "Nutze TLS", "Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", @@ -49,7 +49,7 @@ "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.", "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.", -"Directory Settings" => "Verzeichnis-Einstellungen", +"Directory Settings" => "Verzeichniseinstellungen", "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ", "Base User Tree" => "Basis-Benutzerbaum", @@ -62,7 +62,7 @@ "One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile", "Group Search Attributes" => "Gruppen-Suche Eigenschaften", "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", -"Special Attributes" => "besondere Eigenschaften", +"Special Attributes" => "Besondere Eigenschaften", "in bytes" => "in Bytes", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", "Help" => "Hilfe" diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php index 8f67575fc0f..bd5d328e477 100644 --- a/apps/user_webdavauth/l10n/de_DE.php +++ b/apps/user_webdavauth/l10n/de_DE.php @@ -1,5 +1,5 @@ "WebDAV Authentifizierung", "URL: http://" => "URL: http://", -"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren." ); diff --git a/core/l10n/be.php b/core/l10n/be.php new file mode 100644 index 00000000000..ecf16e5d6a7 --- /dev/null +++ b/core/l10n/be.php @@ -0,0 +1,6 @@ + "Дасведчаны", +"Finish setup" => "Завяршыць ўстаноўку.", +"prev" => "Папярэдняя", +"next" => "Далей" +); diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index b099510d0d9..34305258944 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,8 +1,8 @@ "Der Nutzer %s hat eine Datei für Sie freigegeben", -"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s", +"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Ihnen geteilt", +"User %s shared a folder with you" => "%s hat einen Ordner mit Ihnen geteilt", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", @@ -53,32 +53,32 @@ "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", "The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.", -"Shared" => "Freigegeben", -"Share" => "Freigeben", -"Error while sharing" => "Fehler bei der Freigabe", -"Error while unsharing" => "Fehler bei der Aufhebung der Freigabe", +"Shared" => "Geteilt", +"Share" => "Teilen", +"Error while sharing" => "Fehler beim Teilen", +"Error while unsharing" => "Fehler bei der Aufhebung der Teilung", "Error while changing permissions" => "Fehler bei der Änderung der Rechte", -"Shared with you and the group {group} by {owner}" => "Durch {owner} für Sie und die Gruppe {group} freigegeben.", -"Shared with you by {owner}" => "Durch {owner} für Sie freigegeben.", -"Share with" => "Freigeben für", -"Share with link" => "Über einen Link freigeben", +"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.", +"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.", +"Share with" => "Teilen mit", +"Share with link" => "Über einen Link teilen", "Password protect" => "Passwortschutz", "Password" => "Passwort", "Email link to person" => "Link per E-Mail verschicken", "Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", -"Share via email:" => "Mittels einer E-Mail freigeben:", +"Share via email:" => "Mittels einer E-Mail teilen:", "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Freigegeben in {item} von {user}", -"Unshare" => "Freigabe aufheben", +"Unshare" => "Teilung aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", "update" => "aktualisieren", "delete" => "löschen", -"share" => "freigeben", +"share" => "teilen", "Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", @@ -110,7 +110,7 @@ "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", -"For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server wahrscheinlich konfigurieren.", +"For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.", "Create an admin account" => "Administrator-Konto anlegen", "Advanced" => "Fortgeschritten", "Data folder" => "Datenverzeichnis", diff --git a/l10n/be/core.po b/l10n/be/core.po index e5b4699d86e..dcb31520cd1 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Семён Гариленко <2507496@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2011-07-25 16:05+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"PO-Revision-Date: 2013-02-16 19:10+0000\n" +"Last-Translator: Сёмка Гавриленко <2507496@gmail.com>\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -502,7 +503,7 @@ msgstr "" #: templates/installation.php:52 msgid "Advanced" -msgstr "" +msgstr "Дасведчаны" #: templates/installation.php:54 msgid "Data folder" @@ -539,7 +540,7 @@ msgstr "" #: templates/installation.php:136 msgid "Finish setup" -msgstr "" +msgstr "Завяршыць ўстаноўку." #: templates/layout.guest.php:33 msgid "web services under your control" @@ -581,11 +582,11 @@ msgstr "" #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "Папярэдняя" #: templates/part.pagenavi.php:20 msgid "next" -msgstr "" +msgstr "Далей" #: templates/update.php:3 #, php-format diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 722be0b3c8f..e1b0cc93f87 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 11: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" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,7 +281,7 @@ msgstr "Des d'enllaç" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Fitxers esborrats" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index a8ffe8861e3..b471458f11d 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -26,10 +26,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:31+0000\n" -"Last-Translator: stefanniedermann \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"PO-Revision-Date: 2013-02-16 23:00+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,26 +39,26 @@ msgstr "" #: ajax/share.php:85 #, php-format msgid "User %s shared a file with you" -msgstr "Der Nutzer %s hat eine Datei für Sie freigegeben" +msgstr "Der Nutzer %s hat eine Datei mit Ihnen geteilt" #: ajax/share.php:87 #, php-format msgid "User %s shared a folder with you" -msgstr "%s hat ein Verzeichnis für Sie freigegeben" +msgstr "%s hat einen Ordner mit Ihnen geteilt" #: ajax/share.php:89 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s" +msgstr "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s" #: ajax/share.php:91 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s" +msgstr "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -272,19 +272,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert." #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "Freigegeben" +msgstr "Geteilt" #: js/share.js:93 msgid "Share" -msgstr "Freigeben" +msgstr "Teilen" #: js/share.js:141 js/share.js:622 msgid "Error while sharing" -msgstr "Fehler bei der Freigabe" +msgstr "Fehler beim Teilen" #: js/share.js:152 msgid "Error while unsharing" -msgstr "Fehler bei der Aufhebung der Freigabe" +msgstr "Fehler bei der Aufhebung der Teilung" #: js/share.js:159 msgid "Error while changing permissions" @@ -292,19 +292,19 @@ msgstr "Fehler bei der Änderung der Rechte" #: js/share.js:168 msgid "Shared with you and the group {group} by {owner}" -msgstr "Durch {owner} für Sie und die Gruppe {group} freigegeben." +msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt." #: js/share.js:170 msgid "Shared with you by {owner}" -msgstr "Durch {owner} für Sie freigegeben." +msgstr "Von {owner} mit Ihnen geteilt." #: js/share.js:175 msgid "Share with" -msgstr "Freigeben für" +msgstr "Teilen mit" #: js/share.js:180 msgid "Share with link" -msgstr "Über einen Link freigeben" +msgstr "Über einen Link teilen" #: js/share.js:183 msgid "Password protect" @@ -332,7 +332,7 @@ msgstr "Ablaufdatum" #: js/share.js:227 msgid "Share via email:" -msgstr "Mittels einer E-Mail freigeben:" +msgstr "Mittels einer E-Mail teilen:" #: js/share.js:229 msgid "No people found" @@ -348,7 +348,7 @@ msgstr "Freigegeben in {item} von {user}" #: js/share.js:313 msgid "Unshare" -msgstr "Freigabe aufheben" +msgstr "Teilung aufheben" #: js/share.js:325 msgid "can edit" @@ -372,7 +372,7 @@ msgstr "löschen" #: js/share.js:339 msgid "share" -msgstr "freigeben" +msgstr "teilen" #: js/share.js:373 js/share.js:569 msgid "Password protected" @@ -513,7 +513,7 @@ msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server wahrscheinlich konfigurieren." +msgstr "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren." #: templates/installation.php:36 msgid "Create an admin account" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index f7896897c3b..192ed3dbb85 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -32,9 +32,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" -"PO-Revision-Date: 2013-02-15 10:50+0000\n" -"Last-Translator: robN \n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 16:30+0000\n" +"Last-Translator: Marcel Kühlhorn \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po index a4b8388e603..f69dc4f4853 100644 --- a/l10n/de_DE/files_encryption.po +++ b/l10n/de_DE/files_encryption.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 23:00+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,11 +33,11 @@ msgstr "Datei-Verschlüsselung ist aktiviert" #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "Die folgenden Datei-Typen werden nicht verschlüsselt:" +msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:" +msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index d9e42dce660..0a68526442b 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -4,6 +4,7 @@ # # Translators: # I Robot , 2013. +# Marcel Kühlhorn , 2013. # Phillip Schichtel , 2013. # , 2013. # Susi <>, 2013. @@ -11,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:43+0000\n" -"Last-Translator: stefanniedermann \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 13:51+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,7 +25,7 @@ msgstr "" #: ajax/delete.php:22 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Konnte %s nicht permanent löschen" +msgstr "Konnte %s nicht entgültig löschen" #: ajax/undelete.php:41 #, php-format @@ -33,7 +34,7 @@ msgstr "Konnte %s nicht wiederherstellen" #: js/trash.js:7 js/trash.js:94 msgid "perform restore operation" -msgstr "Führe die Wiederherstellung aus" +msgstr "Wiederherstellung ausführen" #: js/trash.js:33 msgid "delete file permanently" diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po index 8ea9b51ed6e..a9ddf034b67 100644 --- a/l10n/de_DE/files_versions.po +++ b/l10n/de_DE/files_versions.po @@ -16,10 +16,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 10:50+0000\n" -"Last-Translator: robN \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 23:10+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -51,7 +51,7 @@ msgstr "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden" #: history.php:68 msgid "No old versions available" -msgstr "keine älteren Versionen verfügbar" +msgstr "Keine älteren Versionen verfügbar" #: history.php:73 msgid "No path specified" @@ -63,7 +63,7 @@ msgstr "Historie" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück" +msgstr "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück" #: templates/settings.php:3 msgid "Files Versioning" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 630cd9fa410..564fc444d52 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -17,10 +17,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 13:00+0000\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"PO-Revision-Date: 2013-02-16 22:56+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 77ae2f776f2..5482f3ee32a 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -13,7 +13,7 @@ # Lukas Reschke , 2013. # , 2012. # , 2012. -# Marcel Kühlhorn , 2012. +# Marcel Kühlhorn , 2012-2013. # , 2012. # , 2012. # Phi Lieb <>, 2012. @@ -30,10 +30,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 13:00+0000\n" -"Last-Translator: robN \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"PO-Revision-Date: 2013-02-16 23:25+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -170,11 +170,11 @@ msgstr "Löschen" #: js/users.js:191 msgid "add group" -msgstr "Gruppe konnte nicht hinzugefügt werden" +msgstr "Gruppe hinzufügen" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Es muss ein gültiger Benutzername angegeben werden" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" @@ -182,9 +182,9 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Es muss ein gültiges Passwort angegeben werden" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Deutsch (Förmlich: Sie)" @@ -209,7 +209,7 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist." +msgstr "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist." #: templates/admin.php:33 #, php-format @@ -218,17 +218,17 @@ msgstr "Bitte prüfen Sie die Instalationsanleitungen." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Das Modul 'fileinfo' fehlt" #: 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 "" +msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Lokalisierung funktioniert nicht" #: templates/admin.php:61 msgid "" @@ -254,7 +254,7 @@ msgstr "" #: templates/admin.php:89 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:98 msgid "Execute one task with each page loaded" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 18580dda23a..a2eb0d878ec 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -18,10 +18,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:43+0000\n" -"Last-Translator: stefanniedermann \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 23:20+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,19 +34,19 @@ msgstr "Das Löschen der Server-Konfiguration schlug fehl" #: ajax/testConfiguration.php:35 msgid "The configuration is valid and the connection could be established!" -msgstr "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!" +msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!" #: ajax/testConfiguration.php:37 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "Die Konfiguration ist valide, aber das Herstellen einer Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate." +msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate." #: ajax/testConfiguration.php:40 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "Die Konfiguration ist nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen." +msgstr "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen." #: js/settings.js:66 msgid "Deletion failed" @@ -54,7 +54,7 @@ msgstr "Löschen fehlgeschlagen" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?" +msgstr "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?" #: js/settings.js:83 msgid "Keep settings?" @@ -62,19 +62,19 @@ msgstr "Einstellungen behalten?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "Das Hinzufügen der Server-Konfiguration schlug fehl" +msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "Verbindungs-Test erfolgreich" +msgstr "Verbindungstest erfolgreich" #: js/settings.js:126 msgid "Connection test failed" -msgstr "Verbindungs-Test fehlgeschlagen" +msgstr "Verbindungstest fehlgeschlagen" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "Möchten Sie wirklich die Server-Konfiguration löschen?" +msgstr "Möchten Sie die Serverkonfiguration wirklich löschen?" #: js/settings.js:137 msgid "Confirm Deletion" @@ -95,11 +95,11 @@ msgstr "Warnung: Da das PHP-Modul für LDAP ist nicht installiert, das Ba #: templates/settings.php:15 msgid "Server configuration" -msgstr "Server-Konfiguration" +msgstr "Serverkonfiguration" #: templates/settings.php:17 msgid "Add Server Configuration" -msgstr "Server-Konfiguration hinzufügen" +msgstr "Serverkonfiguration hinzufügen" #: templates/settings.php:21 msgid "Host" @@ -183,7 +183,7 @@ msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" #: templates/settings.php:31 msgid "Connection Settings" -msgstr "Verbindungs-Einstellungen" +msgstr "Verbindungseinstellungen" #: templates/settings.php:33 msgid "Configuration Active" @@ -217,7 +217,7 @@ msgstr "Hauptserver deaktivieren" #: templates/settings.php:37 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden." +msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden." #: templates/settings.php:38 msgid "Use TLS" @@ -251,7 +251,7 @@ msgstr "in Sekunden. Eine Änderung leert den Cache." #: templates/settings.php:43 msgid "Directory Settings" -msgstr "Verzeichnis-Einstellungen" +msgstr "Verzeichniseinstellungen" #: templates/settings.php:45 msgid "User Display Name Field" @@ -303,7 +303,7 @@ msgstr "Assoziation zwischen Gruppe und Benutzer" #: templates/settings.php:53 msgid "Special Attributes" -msgstr "besondere Eigenschaften" +msgstr "Besondere Eigenschaften" #: templates/settings.php:56 msgid "in bytes" diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po index 2d01d1e91e1..3592cedb142 100644 --- a/l10n/de_DE/user_webdavauth.po +++ b/l10n/de_DE/user_webdavauth.po @@ -4,16 +4,17 @@ # # Translators: # , 2012-2013. +# Marcel Kühlhorn , 2013. # , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-16 00:19+0100\n" -"PO-Revision-Date: 2013-01-15 22:23+0000\n" -"Last-Translator: a.tangemann \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 14:00+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,9 +29,9 @@ msgstr "WebDAV Authentifizierung" msgid "URL: http://" msgstr "URL: http://" -#: templates/settings.php:6 +#: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." +msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren." diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index e42625a78a7..60fc1271eb0 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 10: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" @@ -279,7 +279,7 @@ msgstr "Linkistä" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Poistetut tiedostot" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index b165922be01..3681ab7e403 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -14,7 +14,7 @@ # Jan-Christoph Borchardt , 2011. # , 2012. # , 2012. -# Nahir Mohamed , 2012. +# Nahir Mohamed , 2012-2013. # , 2012. # Robert Di Rosa <>, 2012. # , 2011, 2012. @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"PO-Revision-Date: 2013-02-16 19:10+0000\n" +"Last-Translator: Nahir Mohamed \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" @@ -162,23 +162,23 @@ msgstr "Groupe Admin" msgid "Delete" msgstr "Supprimer" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "ajouter un groupe" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "Un nom d'utilisateur valide doit être saisi" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "Erreur lors de la création de l'utilisateur" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "Un mot de passe valide doit être saisi" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Français" @@ -276,19 +276,19 @@ msgstr "Activer l'API de partage" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Autoriser les applications à utiliser l'API de partage" #: templates/admin.php:139 msgid "Allow links" -msgstr "" +msgstr "Autoriser les liens" #: templates/admin.php:140 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens" #: templates/admin.php:147 msgid "Allow resharing" -msgstr "" +msgstr "Autoriser le repartage" #: templates/admin.php:148 msgid "Allow users to share items shared with them again" @@ -304,30 +304,30 @@ msgstr "" #: templates/admin.php:165 msgid "Security" -msgstr "" +msgstr "Sécurité" #: templates/admin.php:178 msgid "Enforce HTTPS" -msgstr "" +msgstr "Forcer HTTPS" #: templates/admin.php:179 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Forcer les clients à se connecter à Owncloud via une connexion chiffrée." #: templates/admin.php:182 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL." #: templates/admin.php:192 msgid "Log" -msgstr "" +msgstr "Log" #: templates/admin.php:193 msgid "Log level" -msgstr "" +msgstr "Niveau de log" #: templates/admin.php:220 msgid "More" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index fcc6d86ae4b..6214f745168 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"PO-Revision-Date: 2013-02-16 18:50+0000\n" +"Last-Translator: Langaru \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" @@ -288,7 +288,7 @@ msgstr "Из ссылки" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Удалённые файлы" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 2822af0fa6c..50f1af05b63 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index fd84b8854b0..71954fdbcda 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index f3a9c41f44f..0c073a307c4 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index b1555b2cfec..18b776ea2cf 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -115,6 +115,6 @@ msgstr "" msgid "SSL root certificates" msgstr "" -#: templates/settings.php:153 +#: templates/settings.php:154 msgid "Import Root Certificate" msgstr "" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 078d6a894d5..1d3b14bb15a 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index ca7dd1f208c..04f88ffe328 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 56ffebb83ee..2c0f327e1da 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index b1b060a1e29..56633541bc8 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 1c27a1ae28d..ccb82adc96f 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 29a637c80d9..139967bb8bb 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 59d943daf4f..419f2f574c3 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" +"POT-Creation-Date: 2013-02-17 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index cf947019585..b97dfdc38bb 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -30,13 +30,19 @@ "Groups" => "Gruppen", "Group Admin" => "Gruppenadministrator", "Delete" => "Löschen", -"add group" => "Gruppe konnte nicht hinzugefügt werden", +"add group" => "Gruppe hinzufügen", +"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)", "Security Warning" => "Sicherheitshinweis", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.", -"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", +"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", +"Locale not working" => "Lokalisierung funktioniert nicht", +"Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus", "Sharing" => "Teilen", "Enable Share API" => "Teilen-API aktivieren", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 7276f56f2b4..19d3a243c9d 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -51,6 +51,16 @@ "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système.", "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 resharing" => "Autoriser le repartage", +"Security" => "Sécurité", +"Enforce HTTPS" => "Forcer HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients à se connecter à Owncloud via une connexion chiffrée.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL.", +"Log" => "Log", +"Log level" => "Niveau de log", "More" => "Plus", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Développé par la communauté ownCloud, le code source est publié sous license AGPL.", -- GitLab From 451daf3ab14edde76f4d04e6fe41519cf517fe47 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 17 Feb 2013 20:09:03 +0100 Subject: [PATCH 067/353] Keep user quota into account when the storage backend has unkown free space --- lib/fileproxy/quota.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index 07d1d250e4d..3dac3264fbe 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -62,21 +62,21 @@ class OC_FileProxy_Quota extends OC_FileProxy{ * @var string $internalPath */ list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path); - $owner=$storage->getOwner($internalPath); + $owner = $storage->getOwner($internalPath); if (!$owner) { return -1; } - $totalSpace=$this->getQuota($owner); - if($totalSpace==-1) { + $totalSpace = $this->getQuota($owner); + if($totalSpace == -1) { return -1; } $view = new \OC\Files\View("/".$owner."/files"); - $rootInfo=$view->getFileInfo('/'); - $usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0; - return $totalSpace-$usedSpace; + $rootInfo = $view->getFileInfo('/'); + $usedSpace = isset($rootInfo['size'])?$rootInfo['size']:0; + return $totalSpace - $usedSpace; } public function postFree_space($path, $space) { @@ -84,6 +84,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{ if($free==-1) { return $space; } + if ($space < 0){ + return $free; + } return min($free, $space); } -- GitLab From 3b9796bfcce38e6e4138ffc68f5a2ff6e34492a0 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 18 Feb 2013 00:06:45 +0100 Subject: [PATCH 068/353] [tx-robot] updated from transifex --- apps/files/l10n/de.php | 7 +- apps/files/l10n/el.php | 1 + apps/files/l10n/eu.php | 1 + apps/files/l10n/hu_HU.php | 1 + apps/files_versions/l10n/de.php | 2 +- apps/user_ldap/l10n/de.php | 2 +- apps/user_ldap/l10n/el.php | 15 +++ apps/user_ldap/l10n/eu.php | 1 + apps/user_webdavauth/l10n/de.php | 2 +- core/l10n/de.php | 30 +++--- core/l10n/el.php | 6 ++ l10n/de/core.po | 36 +++---- l10n/de/files.po | 16 +-- l10n/de/files_encryption.po | 6 +- l10n/de/files_trashbin.po | 6 +- l10n/de/files_versions.po | 8 +- l10n/de/lib.po | 66 ++++++------- l10n/de/settings.po | 18 ++-- l10n/de/user_ldap.po | 118 +++++++++++----------- l10n/de/user_webdavauth.po | 13 +-- l10n/de_DE/lib.po | 4 +- l10n/de_DE/settings.po | 24 ++--- l10n/el/core.po | 19 ++-- l10n/el/files.po | 8 +- l10n/el/lib.po | 89 ++++++++--------- l10n/el/settings.po | 47 ++++----- l10n/el/user_ldap.po | 147 ++++++++++++++-------------- l10n/eu/files.po | 8 +- l10n/eu/settings.po | 18 ++-- l10n/eu/user_ldap.po | 116 +++++++++++----------- l10n/gl/settings.po | 32 +++--- l10n/hu_HU/files.po | 8 +- l10n/ru/lib.po | 79 +++++++-------- l10n/ru/settings.po | 18 ++-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 6 +- 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 | 112 ++++++++++----------- l10n/templates/user_webdavauth.pot | 2 +- l10n/zh_TW/settings.po | 23 ++--- lib/l10n/de.php | 4 +- lib/l10n/el.php | 13 +++ lib/l10n/ru.php | 8 ++ settings/l10n/de_DE.php | 11 ++- settings/l10n/el.php | 15 +++ settings/l10n/eu.php | 1 + settings/l10n/gl.php | 12 +++ settings/l10n/ru.php | 2 + settings/l10n/zh_TW.php | 3 + 55 files changed, 649 insertions(+), 551 deletions(-) diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index d96e512ece2..20fdd2f8153 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -1,7 +1,7 @@ "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits.", -"Could not move %s" => "Konnte %s nicht verschieben", -"Unable to rename file" => "Konnte Datei nicht umbenennen", +"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits.", +"Could not move %s" => "%s konnte nicht verschoben werden", +"Unable to rename file" => "Die Datei konnte nicht umbenannt werden", "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler", "There is no error, the file uploaded with success" => "Datei fehlerfrei 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", @@ -60,6 +60,7 @@ "Text file" => "Textdatei", "Folder" => "Ordner", "From link" => "Von einem Link", +"Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", "Download" => "Herunterladen", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 2a110afa960..60456d180d3 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -60,6 +60,7 @@ "Text file" => "Αρχείο κειμένου", "Folder" => "Φάκελος", "From link" => "Από σύνδεσμο", +"Deleted files" => "Διαγραμμένα αρχεία", "Cancel upload" => "Ακύρωση αποστολής", "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!", "Download" => "Λήψη", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 10f19cf4cbb..796f1c4009d 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -60,6 +60,7 @@ "Text file" => "Testu fitxategia", "Folder" => "Karpeta", "From link" => "Estekatik", +"Deleted files" => "Ezabatutako fitxategiak", "Cancel upload" => "Ezeztatu igoera", "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!", "Download" => "Deskargatu", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 9eed324415a..7a11c303f5e 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -60,6 +60,7 @@ "Text file" => "Szövegfájl", "Folder" => "Mappa", "From link" => "Feltöltés linkről", +"Deleted files" => "Törölt fájlok", "Cancel upload" => "A feltöltés megszakítása", "Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!", "Download" => "Letöltés", diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php index f62043dade2..d7427fbbbf2 100644 --- a/apps/files_versions/l10n/de.php +++ b/apps/files_versions/l10n/de.php @@ -7,7 +7,7 @@ "No old versions available" => "Keine älteren Versionen verfügbar", "No path specified" => "Kein Pfad angegeben", "History" => "Historie", -"Revert a file to a previous version by clicking on its revert button" => "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück", +"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück", "Files Versioning" => "Dateiversionierung", "Enable" => "Aktivieren" ); diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index a1da7d49cbe..182025e8fb9 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -12,7 +12,7 @@ "Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?", "Confirm Deletion" => "Löschung bestätigen", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", -"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.", "Server configuration" => "Serverkonfiguration", "Add Server Configuration" => "Serverkonfiguration hinzufügen", "Host" => "Host", diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index 7c0940dc09c..96ec8180437 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -1,6 +1,19 @@ "Αποτυχία διαγραφής ρυθμίσεων διακομιστή", +"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 invalid. Please look in the ownCloud log for further details." => "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες.", "Deletion failed" => "Η διαγραφή απέτυχε", +"Keep settings?" => "Διατήρηση ρυθμίσεων;", +"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή", +"Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση", +"Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.", +"Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;", +"Confirm Deletion" => "Επιβεβαίωση Διαγραφής", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Προσοχή: Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Προσοχή: Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει.", +"Server configuration" => "Ρυθμίσεις Διακομιστή", +"Add Server Configuration" => "Προσθήκη Ρυθμίσεων Διακομιστή", "Host" => "Διακομιστής", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://", "Base DN" => "Base DN", @@ -18,6 +31,7 @@ "Group Filter" => "Group Filter", "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".", +"Connection Settings" => "Ρυθμίσεις Σύνδεσης", "Port" => "Θύρα", "Use TLS" => "Χρήση TLS", "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ", @@ -25,6 +39,7 @@ "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.", "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.", "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.", +"Directory Settings" => "Ρυθμίσεις Καταλόγου", "User Display Name Field" => "Πεδίο Ονόματος Χρήστη", "The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.", "Base User Tree" => "Base User Tree", diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php index 7ab4d00e756..46d93dc3a44 100644 --- a/apps/user_ldap/l10n/eu.php +++ b/apps/user_ldap/l10n/eu.php @@ -4,6 +4,7 @@ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.", "The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurazioa ez dago ongi. Mesedez ikusi ownCloud-en egunerokoa informazio gehiago eskuratzeko.", "Deletion failed" => "Ezabaketak huts egin du", +"Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?", "Keep settings?" => "Mantendu ezarpenak?", "Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu", "Connection test succeeded" => "Konexio froga ongi burutu da", diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php index f893bddc71c..c86ff44e55c 100644 --- a/apps/user_webdavauth/l10n/de.php +++ b/apps/user_webdavauth/l10n/de.php @@ -1,5 +1,5 @@ "WebDAV Authentifikation", "URL: http://" => "URL: http://", -"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten." +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren." ); diff --git a/core/l10n/de.php b/core/l10n/de.php index c18cf7259c5..f1e892fee47 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,8 +1,8 @@ "Der Nutzer %s hat eine Datei für Dich freigegeben", -"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s", +"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit dir geteilt", +"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", @@ -53,32 +53,32 @@ "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", "The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.", -"Shared" => "Freigegeben", -"Share" => "Freigeben", -"Error while sharing" => "Fehler beim Freigeben", -"Error while unsharing" => "Fehler beim Aufheben der Freigabe", +"Shared" => "Geteilt", +"Share" => "Teilen", +"Error while sharing" => "Fehler beim Teilen", +"Error while unsharing" => "Fehler beim Aufheben der Teilung", "Error while changing permissions" => "Fehler beim Ändern der Rechte", -"Shared with you and the group {group} by {owner}" => "{owner} hat dies für Dich und die Gruppe {group} freigegeben", -"Shared with you by {owner}" => "{owner} hat dies für Dich freigegeben", -"Share with" => "Freigeben für", -"Share with link" => "Über einen Link freigeben", +"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt", +"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt", +"Share with" => "Teilen mit", +"Share with link" => "Über einen Link teilen", "Password protect" => "Passwortschutz", "Password" => "Passwort", "Email link to person" => "Link per E-Mail verschicken", "Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", -"Share via email:" => "Über eine E-Mail freigeben:", +"Share via email:" => "Über eine E-Mail teilen:", "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Für {user} in {item} freigegeben", -"Unshare" => "Freigabe aufheben", +"Unshare" => "Teilung aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", "update" => "aktualisieren", "delete" => "löschen", -"share" => "freigeben", +"share" => "teilen", "Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", diff --git a/core/l10n/el.php b/core/l10n/el.php index 54720f5ecb3..62d12569337 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -53,6 +53,7 @@ "Error" => "Σφάλμα", "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.", "The required file {file} is not installed!" => "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!", +"Shared" => "Κοινόχρηστα", "Share" => "Διαμοιρασμός", "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό", "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού", @@ -83,6 +84,8 @@ "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.", "ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud", "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}", "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.", @@ -106,6 +109,8 @@ "Security Warning" => "Προειδοποίηση Ασφαλείας", "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." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.", +"For information how to properly configure your server, please see the documentation." => "Για πληροφορίες σχετικά με την σωστή ρύθμιση του διακομιστή σας, δείτε στην τεκμηρίωση.", "Create an admin account" => "Δημιουργήστε έναν λογαριασμό διαχειριστή", "Advanced" => "Για προχωρημένους", "Data folder" => "Φάκελος δεδομένων", @@ -125,6 +130,7 @@ "Lost your password?" => "Ξεχάσατε το συνθηματικό σας;", "remember" => "απομνημόνευση", "Log in" => "Είσοδος", +"Alternative Logins" => "Εναλλακτικές Συνδέσεις", "prev" => "προηγούμενο", "next" => "επόμενο", "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο." diff --git a/l10n/de/core.po b/l10n/de/core.po index 7c7862c863a..bb7deec1e67 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -23,10 +23,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 21:40+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:10+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,26 +36,26 @@ msgstr "" #: ajax/share.php:85 #, php-format msgid "User %s shared a file with you" -msgstr "Der Nutzer %s hat eine Datei für Dich freigegeben" +msgstr "Der Nutzer %s hat eine Datei mit dir geteilt" #: ajax/share.php:87 #, php-format msgid "User %s shared a folder with you" -msgstr "%s hat ein Verzeichnis für Dich freigegeben" +msgstr "%s hat ein Verzeichnis mit dir geteilt" #: ajax/share.php:89 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s" +msgstr "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s" #: ajax/share.php:91 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s" +msgstr "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -269,19 +269,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert." #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "Freigegeben" +msgstr "Geteilt" #: js/share.js:93 msgid "Share" -msgstr "Freigeben" +msgstr "Teilen" #: js/share.js:141 js/share.js:622 msgid "Error while sharing" -msgstr "Fehler beim Freigeben" +msgstr "Fehler beim Teilen" #: js/share.js:152 msgid "Error while unsharing" -msgstr "Fehler beim Aufheben der Freigabe" +msgstr "Fehler beim Aufheben der Teilung" #: js/share.js:159 msgid "Error while changing permissions" @@ -289,19 +289,19 @@ msgstr "Fehler beim Ändern der Rechte" #: js/share.js:168 msgid "Shared with you and the group {group} by {owner}" -msgstr "{owner} hat dies für Dich und die Gruppe {group} freigegeben" +msgstr "{owner} hat dies mit dir und der Gruppe {group} geteilt" #: js/share.js:170 msgid "Shared with you by {owner}" -msgstr "{owner} hat dies für Dich freigegeben" +msgstr "{owner} hat dies mit dir geteilt" #: js/share.js:175 msgid "Share with" -msgstr "Freigeben für" +msgstr "Teilen mit" #: js/share.js:180 msgid "Share with link" -msgstr "Über einen Link freigeben" +msgstr "Über einen Link teilen" #: js/share.js:183 msgid "Password protect" @@ -329,7 +329,7 @@ msgstr "Ablaufdatum" #: js/share.js:227 msgid "Share via email:" -msgstr "Über eine E-Mail freigeben:" +msgstr "Über eine E-Mail teilen:" #: js/share.js:229 msgid "No people found" @@ -345,7 +345,7 @@ msgstr "Für {user} in {item} freigegeben" #: js/share.js:313 msgid "Unshare" -msgstr "Freigabe aufheben" +msgstr "Teilung aufheben" #: js/share.js:325 msgid "can edit" @@ -369,7 +369,7 @@ msgstr "löschen" #: js/share.js:339 msgid "share" -msgstr "freigeben" +msgstr "teilen" #: js/share.js:373 js/share.js:569 msgid "Password protected" diff --git a/l10n/de/files.po b/l10n/de/files.po index 0d7576ef626..2acad72935f 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -28,10 +28,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 13:50+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,16 +41,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits." +msgstr "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits." #: ajax/move.php:27 ajax/move.php:30 #, php-format msgid "Could not move %s" -msgstr "Konnte %s nicht verschieben" +msgstr "%s konnte nicht verschoben werden" #: ajax/rename.php:22 ajax/rename.php:25 msgid "Unable to rename file" -msgstr "Konnte Datei nicht umbenennen" +msgstr "Die Datei konnte nicht umbenannt werden" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" @@ -295,7 +295,7 @@ msgstr "Von einem Link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Gelöschte Dateien" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po index 7c707e5f898..3cfd6711a27 100644 --- a/l10n/de/files_encryption.po +++ b/l10n/de/files_encryption.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 22:10+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:12+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index 177c56d3b8f..1aa1fd8154b 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 21:50+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:23+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po index 5926d03cb4e..51c809db1bd 100644 --- a/l10n/de/files_versions.po +++ b/l10n/de/files_versions.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 22:10+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:20+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -60,7 +60,7 @@ msgstr "Historie" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück" +msgstr "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück" #: templates/settings.php:3 msgid "Files Versioning" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index c13aaaa3498..ba89f5ea5fe 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -14,37 +14,37 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 20:50+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:10+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "Hilfe" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "Persönlich" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "Einstellungen" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "Benutzer" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "Apps" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "Administrator" @@ -56,15 +56,15 @@ msgstr "Der ZIP-Download ist deaktiviert." msgid "Files need to be downloaded one by one." msgstr "Die Dateien müssen einzeln heruntergeladen werden." -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "Zurück zu \"Dateien\"" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "Konnte nicht festgestellt werden" @@ -124,15 +124,15 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten" msgid "%s set the database host." msgstr "%s setze den Datenbank-Host" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" msgstr "PostgreSQL Benutzername und/oder Passwort ungültig" #: setup.php:127 setup.php:150 setup.php:204 msgid "You need to enter either an existing account or the administrator." -msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben." +msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben." -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" msgstr "Oracle Benutzername und/oder Passwort ungültig" @@ -140,54 +140,54 @@ msgstr "Oracle Benutzername und/oder Passwort ungültig" msgid "MySQL username and/or password not valid" msgstr "MySQL Benutzername und/oder Passwort ungültig" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" msgstr "DB Fehler: \"%s\"" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" msgstr "Fehlerhafter Befehl war: \"%s\"" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits." -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" msgstr "Lösche diesen Benutzer von MySQL" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" msgstr "MySQL Benutzer '%s'@'%%' existiert bereits" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." msgstr "Lösche diesen Benutzer von MySQL." -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist." -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." -msgstr "Bitte prüfen Sie die Instalationsanleitungen." +msgstr "Bitte prüfe die Instalationsanleitungen." #: template.php:113 msgid "seconds ago" @@ -241,16 +241,16 @@ msgstr "Letztes Jahr" msgid "years ago" msgstr "Vor Jahren" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s ist verfügbar. Weitere Informationen" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "aktuell" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "Die Update-Überprüfung ist ausgeschaltet" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 927cfec9c73..736ddb0719b 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -26,10 +26,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:31+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -164,23 +164,23 @@ msgstr "Gruppenadministrator" msgid "Delete" msgstr "Löschen" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "Gruppe hinzufügen" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "Es muss ein gültiger Benutzername angegeben werden" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "Beim anlegen des Benutzers ist ein Fehler aufgetreten" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "Es muss ein gültiges Passwort angegeben werden" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Deutsch (Persönlich)" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index b4bd8a2d9ba..431c6be2aee 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -16,10 +16,10 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 22:01+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:20+0000\n" "Last-Translator: Marcel Kühlhorn \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -30,17 +30,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "Löschen der Serverkonfiguration fehlgeschlagen" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -89,230 +89,230 @@ msgstr "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkom msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren." +msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren." #: templates/settings.php:15 msgid "Server configuration" msgstr "Serverkonfiguration" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "Serverkonfiguration hinzufügen" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Host" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "Ein Base DN pro Zeile" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Passwort" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "Konfiguration aktiv" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "Konfiguration wird übersprungen wenn deaktiviert" -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Port" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "Backup Host (Kopie)" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "Backup Port" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" msgstr "Hauptserver deaktivieren" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Schalte die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" msgstr "Ordnereinstellungen" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "Ein Benutzer Base DN pro Zeile" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "Benutzersucheigenschaften" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "Optional, eine Eigenschaft pro Zeile" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "Ein Gruppen Base DN pro Zeile" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "Gruppensucheigenschaften" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "Spezielle Eigenschaften" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Hilfe" diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po index 3bc6180a309..139f573438e 100644 --- a/l10n/de/user_webdavauth.po +++ b/l10n/de/user_webdavauth.po @@ -4,16 +4,17 @@ # # Translators: # , 2012. +# Marcel Kühlhorn , 2013. # , 2013. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-16 00:19+0100\n" -"PO-Revision-Date: 2013-01-15 00:30+0000\n" -"Last-Translator: AndryXY \n" -"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 13:50+0000\n" +"Last-Translator: Marcel Kühlhorn \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,9 +29,9 @@ msgstr "WebDAV Authentifikation" msgid "URL: http://" msgstr "URL: http://" -#: templates/settings.php:6 +#: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten." +msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren." diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 564fc444d52..1d9413b7ea7 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.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-02-17 00:25+0100\n" -"PO-Revision-Date: 2013-02-16 22:56+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-16 23:30+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 5482f3ee32a..9fe6f6813a9 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -30,8 +30,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" -"PO-Revision-Date: 2013-02-16 23:25+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-16 23:40+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -203,7 +203,7 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Einrichtungswarnung" #: templates/admin.php:32 msgid "" @@ -236,11 +236,11 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "" +msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren." #: templates/admin.php:72 msgid "Internet connection not working" -msgstr "" +msgstr "Keine Netzwerkverbindung" #: templates/admin.php:75 msgid "" @@ -250,7 +250,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." #: templates/admin.php:89 msgid "Cron" @@ -264,13 +264,13 @@ msgstr "Führe eine Aufgabe bei jedem Laden der Seite aus" msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen." #: templates/admin.php:118 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf." #: templates/admin.php:125 msgid "Sharing" @@ -294,19 +294,19 @@ msgstr "Erlaube es Benutzern, Items per öffentlichem Link zu teilen" #: templates/admin.php:147 msgid "Allow resharing" -msgstr "Erlaube weiterteilen" +msgstr "Erlaube weiterverteilen" #: templates/admin.php:148 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen" #: templates/admin.php:155 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Erlaube Nutzern mit jedem zu teilen" #: templates/admin.php:158 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen" #: templates/admin.php:165 msgid "Security" diff --git a/l10n/el/core.po b/l10n/el/core.po index 7752a3076e0..acf7f9910bb 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -6,6 +6,7 @@ # axil Pι , 2012. # Dimitris M. , 2012-2013. # Efstathios Iosifidis , 2012. +# Efstathios Iosifidis , 2013. # Efstathios Iosifidis , 2012. # Marios Bekatoros <>, 2012. # , 2011. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" -"Last-Translator: Dimitris M. \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:50+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -261,7 +262,7 @@ msgstr "Το απαιτούμενο αρχείο {file} δεν εγκαταστ #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "" +msgstr "Κοινόχρηστα" #: js/share.js:93 msgid "Share" @@ -388,11 +389,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην κοινότητα ownCloud." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud." #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -495,14 +496,14 @@ msgstr "Χωρίς το πρόσθετο δημιουργίας τυχαίων msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess." #: templates/installation.php:32 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Για πληροφορίες σχετικά με την σωστή ρύθμιση του διακομιστή σας, δείτε στην τεκμηρίωση." #: templates/installation.php:36 msgid "Create an admin account" @@ -585,7 +586,7 @@ msgstr "Είσοδος" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Εναλλακτικές Συνδέσεις" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/el/files.po b/l10n/el/files.po index 3f60220fd58..0a760250dd7 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:10+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -282,7 +282,7 @@ msgstr "Από σύνδεσμο" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Διαγραμμένα αρχεία" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 9d54c6a083b..40c97ff6631 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Efstathios Iosifidis , 2013. # Efstathios Iosifidis , 2012. # , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-11 15:39+0100\n" -"PO-Revision-Date: 2013-02-11 14:41+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:50+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,27 +20,27 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "Βοήθεια" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "Προσωπικά" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "Ρυθμίσεις" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "Χρήστες" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "Εφαρμογές" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "Διαχειριστής" @@ -51,15 +52,15 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε." msgid "Files need to be downloaded one by one." msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα." -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "Πίσω στα Αρχεία" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip." -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "δεν μπορούσε να προσδιορισθεί" @@ -89,15 +90,15 @@ msgstr "Εικόνες" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "Εισάγετε όνομα χρήστη διαχειριστή." #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "Εισάγετε συνθηματικό διαχειριστή." #: setup.php:40 msgid "Specify a data folder." -msgstr "" +msgstr "Καθορίστε τον φάκελο δεδομένων." #: setup.php:53 #, php-format @@ -119,70 +120,70 @@ msgstr "" msgid "%s set the database host." msgstr "" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL" #: setup.php:127 setup.php:150 setup.php:204 msgid "You need to enter either an existing account or the administrator." msgstr "" -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle" #: setup.php:203 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\"" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" msgstr "" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL." -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Απόρριψη αυτού του χρήστη από την MySQL" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Απόρριψη αυτού του χρήστη από την MySQL" -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" msgstr "" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη." -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Ελέγξτε ξανά τις οδηγίες εγκατάστασης." #: template.php:113 msgid "seconds ago" @@ -236,16 +237,16 @@ msgstr "τον προηγούμενο χρόνο" msgid "years ago" msgstr "χρόνια πριν" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s είναι διαθέσιμα. Δείτε περισσότερες πληροφορίες" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "ενημερωμένο" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 525b3614e7a..6c417dcbf34 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -5,6 +5,7 @@ # Translators: # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. +# Efstathios Iosifidis , 2013. # Efstathios Iosifidis , 2012. # , 2012. # , 2012. @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:30+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ #: ajax/updateapp.php:14 msgid "Couldn't update app." -msgstr "" +msgstr "Αδυναμία ενημέρωσης εφαρμογής" #: js/apps.js:30 msgid "Update to {appversion}" @@ -110,15 +111,15 @@ msgstr "Ενεργοποίηση" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "Παρακαλώ περιμένετε..." #: js/apps.js:84 msgid "Updating...." -msgstr "" +msgstr "Ενημέρωση..." #: js/apps.js:87 msgid "Error while updating app" -msgstr "" +msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής" #: js/apps.js:87 msgid "Error" @@ -126,7 +127,7 @@ msgstr "Σφάλμα" #: js/apps.js:90 msgid "Updated" -msgstr "" +msgstr "Ενημερώθηκε" #: js/personal.js:96 msgid "Saving..." @@ -142,7 +143,7 @@ msgstr "αναίρεση" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Αδυναμία αφαίρεση χρήστη" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -157,23 +158,23 @@ msgstr "Ομάδα Διαχειριστών" msgid "Delete" msgstr "Διαγραφή" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" -msgstr "" +msgstr "προσθήκη ομάδας" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Σφάλμα δημιουργίας χρήστη" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__όνομα_γλώσσας__" @@ -192,18 +193,18 @@ msgstr "Ο κατάλογος data και τα αρχεία σας πιθανό #: 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 msgid "Please double check the installation guides." -msgstr "" +msgstr "Ελέγξτε ξανά τις οδηγίες εγκατάστασης." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -243,7 +244,7 @@ msgstr "" #: templates/admin.php:89 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:98 msgid "Execute one task with each page loaded" @@ -299,7 +300,7 @@ msgstr "" #: templates/admin.php:165 msgid "Security" -msgstr "" +msgstr "Ασφάλεια" #: templates/admin.php:178 msgid "Enforce HTTPS" @@ -318,7 +319,7 @@ msgstr "" #: templates/admin.php:192 msgid "Log" -msgstr "" +msgstr "Καταγραφές" #: templates/admin.php:193 msgid "Log level" @@ -397,7 +398,7 @@ msgstr "Χρησιμοποιήσατε %s από διαθέσι #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 972b0601dfa..2f51712882e 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -6,15 +6,16 @@ # , 2012. # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. +# Efstathios Iosifidis , 2013. # Konstantinos Tzanidis , 2012. # Marios Bekatoros <>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 13:00+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,23 +25,23 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες." #: js/settings.js:66 msgid "Deletion failed" @@ -52,27 +53,27 @@ msgstr "" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Διατήρηση ρυθμίσεων;" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Επιτυχημένη δοκιμαστική σύνδεση" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Αποτυχημένη δοκιμαστική σύνδεσης." #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Επιβεβαίωση Διαγραφής" #: templates/settings.php:8 msgid "" @@ -85,230 +86,230 @@ msgstr "Προσοχή: Οι εφαρμογές user_ldap και user_web msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "" +msgstr "Προσοχή: Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει." #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Ρυθμίσεις Διακομιστή" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Προσθήκη Ρυθμίσεων Διακομιστή" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Διακομιστής" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "Base DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "User DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Συνθηματικό" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "User Login Filter" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. " -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "User List Filter" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Group Filter" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"." -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Ρυθμίσεις Σύνδεσης" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Θύρα" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Χρήση TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" -msgstr "" +msgstr "Ρυθμίσεις Καταλόγου" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Πεδίο Ονόματος Χρήστη" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud." -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Base User Tree" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Group Display Name Field" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud." -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Base Group Tree" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Group-Member association" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "σε bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Βοήθεια" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 27a31c2ac49..0e4427c982b 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:30+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -278,7 +278,7 @@ msgstr "Estekatik" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Ezabatutako fitxategiak" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 7e26109a3fd..7a56399da99 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/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-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:30+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -149,23 +149,23 @@ msgstr "Talde administradorea" msgid "Delete" msgstr "Ezabatu" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "gehitu taldea" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "Baliozko erabiltzaile izena eman behar da" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "Errore bat egon da erabiltzailea sortzean" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "Baliozko pasahitza eman behar da" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Euskera" @@ -217,7 +217,7 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "" +msgstr "OwnClud zerbitzari honek ezin du sistemaren lokala \"en_US.UTF-8\"/\"en.US.UTF-8\" ezarri. Honek esan nahi du fitxategi izen batzuekin arazoak egon daitezkeela. Aholkatzen dugu zure sistemak en_US.UTF-8/en_US.UTF8 lokala onartzeko behar diren paketeak instala ditzazun." #: templates/admin.php:72 msgid "Internet connection not working" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index 23c282efa1a..9f66eee4ecb 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/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-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 22:33+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 12:30+0000\n" "Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -23,17 +23,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "Konfigurazioa egokia da eta konexioa ezarri daiteke!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -45,7 +45,7 @@ msgstr "Ezabaketak huts egin du" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?" #: js/settings.js:83 msgid "Keep settings?" @@ -88,224 +88,224 @@ msgstr "Abisua: PHPk behar duen LDAP modulua ez dago instalaturik, motorr msgid "Server configuration" msgstr "Zerbitzariaren konfigurazioa" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "Gehitu Zerbitzariaren Konfigurazioa" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Hostalaria" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "Oinarrizko DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "DN Oinarri bat lerroko" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "Erabiltzaile DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Pasahitza" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "Erabiltzaileen saioa hasteko iragazkia" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "Erabiltzaile zerrendaren Iragazkia" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "txantiloirik gabe, adb. \"objectClass=person\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Taldeen iragazkia" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"." -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" msgstr "Konexio Ezarpenak" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "Konfigurazio Aktiboa" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Portua" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "Babeskopia (Replica) Ostalaria" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "Babeskopia (Replica) Ataka" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" msgstr "Desgaitu Zerbitzari Nagusia" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Erabili TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "Ez erabili LDAPS konexioetarako, huts egingo du." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Ezgaitu SSL ziurtagirien egiaztapena." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "segundutan. Aldaketak katxea husten du." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" msgstr "Karpetaren Ezarpenak" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Erabiltzaileen bistaratzeko izena duen eremua" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Oinarrizko Erabiltzaile Zuhaitza" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "Erabiltzaile DN Oinarri bat lerroko" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "Erabili Bilaketa Atributuak " -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "Aukerakoa; atributu bat lerro bakoitzeko" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Taldeen bistaratzeko izena duen eremua" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Oinarrizko Talde Zuhaitza" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "Talde DN Oinarri bat lerroko" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "Taldekatu Bilaketa Atributuak " -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Talde-Kide elkarketak" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "Atributu Bereziak" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "bytetan" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Laguntza" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 0cfda982514..a05c2158b55 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -4,15 +4,17 @@ # # Translators: # antiparvos , 2012. +# , 2012-2013. # , 2013. # , 2012. +# Miguel Anxo Bouzada , 2013. # Xosé M. Lamas , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 09:10+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 19: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" @@ -32,7 +34,7 @@ msgstr "Produciuse un erro de autenticación" #: ajax/changedisplayname.php:32 msgid "Unable to change display name" -msgstr "" +msgstr "Non é posíbel cambiar o nome visíbel" #: ajax/creategroup.php:10 msgid "Group already exists" @@ -165,7 +167,7 @@ msgstr "Produciuse un erro ao crear o usuario" msgid "A valid password must be provided" msgstr "Debe fornecer un contrasinal" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Galego" @@ -209,7 +211,7 @@ msgstr "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar es #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "A configuración rexional non funciona" #: templates/admin.php:61 msgid "" @@ -217,11 +219,11 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "" +msgstr "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a «en_US.UTF-8\"/\"en_US.UTF8». Isto significa que poden xurdir problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que instale os paquetes necesarios no sistema para admitir en_US.UTF-8/en_US.UTF8." #: templates/admin.php:72 msgid "Internet connection not working" -msgstr "" +msgstr "A conexión á Internet non funciona" #: templates/admin.php:75 msgid "" @@ -231,11 +233,11 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud." #: templates/admin.php:89 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:98 msgid "Execute one task with each page loaded" @@ -245,13 +247,13 @@ msgstr "Executar unha tarefa con cada páxina cargada" msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP." #: templates/admin.php:118 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto." #: templates/admin.php:125 msgid "Sharing" @@ -425,15 +427,15 @@ msgstr "Amosar o nome" #: templates/personal.php:55 msgid "Your display name was changed" -msgstr "" +msgstr "O seu nome visíbel foi cambiado" #: templates/personal.php:56 msgid "Unable to change your display name" -msgstr "" +msgstr "Non é posíbel cambiar o seu nome visíbel" #: templates/personal.php:59 msgid "Change display name" -msgstr "" +msgstr "Cambiar o nome visíbel" #: templates/personal.php:68 msgid "Email" @@ -489,7 +491,7 @@ msgstr "Almacenamento" #: templates/users.php:95 msgid "change display name" -msgstr "" +msgstr "cambiar o nome visíbel" #: templates/users.php:99 msgid "set new password" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index ea2e55fc372..e9dbc61712c 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 08:50+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" @@ -281,7 +281,7 @@ msgstr "Feltöltés linkről" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Törölt fájlok" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 48b7c388720..2ea6cd0776f 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -10,13 +10,14 @@ # , 2012. # Sergey , 2013. # , 2012. +# Дмитрий , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:36+0000\n" -"Last-Translator: Denis \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 20:30+0000\n" +"Last-Translator: Langaru \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" @@ -24,27 +25,27 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "Помощь" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "Личное" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "Настройки" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "Пользователи" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "Приложения" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "Admin" @@ -56,15 +57,15 @@ msgstr "ZIP-скачивание отключено." msgid "Files need to be downloaded one by one." msgstr "Файлы должны быть загружены по одному." -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "Назад к файлам" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "Выбранные файлы слишком велики, чтобы создать zip файл." -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "Невозможно установить" @@ -107,24 +108,24 @@ msgstr "Указать папку данных." #: setup.php:53 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s введите имя пользователя базы данных." #: setup.php:56 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s введите имя базы данных." #: setup.php:59 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s Вы не можете использовать точки в имени базы данных" #: setup.php:62 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s задайте хост базы данных." -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" msgstr "Неверное имя пользователя и/или пароль PostgreSQL" @@ -132,7 +133,7 @@ msgstr "Неверное имя пользователя и/или пароль msgid "You need to enter either an existing account or the administrator." msgstr "Вы должны войти или в существующий аккаунт или под администратором." -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" msgstr "Неверное имя пользователя и/или пароль Oracle" @@ -140,54 +141,54 @@ msgstr "Неверное имя пользователя и/или пароль msgid "MySQL username and/or password not valid" msgstr "Неверное имя пользователя и/или пароль MySQL" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" msgstr "Ошибка БД: \"%s\"" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Вызываемая команда была: \"%s\"" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." msgstr "Пользователь MySQL '%s'@'localhost' уже существует." -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" msgstr "Удалить этого пользователя из MySQL" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" msgstr "Пользователь MySQL '%s'@'%%' уже существует" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." msgstr "Удалить этого пользователя из MySQL." -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV." -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Пожалуйста, дважды просмотрите инструкции по установке." #: template.php:113 msgid "seconds ago" @@ -241,16 +242,16 @@ msgstr "в прошлом году" msgid "years ago" msgstr "годы назад" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "Возможно обновление до %s. Подробнее" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "актуальная версия" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "проверка обновлений отключена" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 4374f73dfa0..5686b6c7660 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 20:30+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" @@ -160,23 +160,23 @@ msgstr "Группа Администраторы" msgid "Delete" msgstr "Удалить" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Русский " @@ -201,12 +201,12 @@ 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." #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Пожалуйста, дважды просмотрите инструкции по установке." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 50f1af05b63..50af374e0d3 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 71954fdbcda..68faae5f7a2 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 0c073a307c4..0e87a9cadfe 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 18b776ea2cf..1c08282555c 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,13 +41,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:413 +#: lib/config.php:418 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:414 +#: lib/config.php:421 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 " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 1d3b14bb15a..035f07db378 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 04f88ffe328..9ae14c07fbf 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 2c0f327e1da..956fa27aa6a 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 56633541bc8..b7a4e24525b 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index ccb82adc96f..f2ed4a30fd5 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 139967bb8bb..defbacb6a4d 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,17 +21,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "" -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -86,222 +86,222 @@ msgstr "" msgid "Server configuration" msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. uid=agent," "dc=example,dc=com. For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 419f2f574c3..cd7a57253ef 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 2962f45fcb8..6f13ba5136c 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -8,6 +8,7 @@ # , 2013. # Pellaeon Lin , 2013. # , 2012. +# , 2013. # , 2012. # , 2012. # ywang , 2012. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"PO-Revision-Date: 2013-02-17 14:00+0000\n" +"Last-Translator: ronnietse \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" @@ -130,7 +131,7 @@ msgstr "儲存中..." #: js/users.js:30 msgid "deleted" -msgstr "" +msgstr "已刪除" #: js/users.js:30 msgid "undo" @@ -138,7 +139,7 @@ msgstr "復原" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "無法刪除用戶" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -153,23 +154,23 @@ msgstr "群組 管理員" msgid "Delete" msgstr "刪除" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" -msgstr "" +msgstr "新增群組" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__語言_名稱__" diff --git a/lib/l10n/de.php b/lib/l10n/de.php index f65ee5cfa3b..0ad254ad844 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -24,7 +24,7 @@ "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten", "%s set the database host." => "%s setze den Datenbank-Host", "PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig", -"You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.", +"You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.", "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig", "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig", "DB Error: \"%s\"" => "DB Fehler: \"%s\"", @@ -35,7 +35,7 @@ "Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", -"Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", +"Please double check the installation guides." => "Bitte prüfe die Instalationsanleitungen.", "seconds ago" => "Gerade eben", "1 minute ago" => "Vor einer Minute", "%d minutes ago" => "Vor %d Minuten", diff --git a/lib/l10n/el.php b/lib/l10n/el.php index cf0be24b432..e2e86edc4da 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -16,6 +16,19 @@ "Files" => "Αρχεία", "Text" => "Κείμενο", "Images" => "Εικόνες", +"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.", +"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.", +"Specify a data folder." => "Καθορίστε τον φάκελο δεδομένων.", +"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL", +"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle", +"MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL", +"DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL.", +"Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL", +"MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη", +"Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL", +"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." => "Ελέγξτε ξανά τις οδηγίες εγκατάστασης.", "seconds ago" => "δευτερόλεπτα πριν", "1 minute ago" => "1 λεπτό πριν", "%d minutes ago" => "%d λεπτά πριν", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c0ffcd68064..7f1111376ef 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -19,15 +19,23 @@ "Set an admin username." => "Установить имя пользователя для admin.", "Set an admin password." => "становит пароль для admin.", "Specify a data folder." => "Указать папку данных.", +"%s enter the database username." => "%s введите имя пользователя базы данных.", +"%s enter the database name." => "%s введите имя базы данных.", +"%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных", +"%s set the database host." => "%s задайте хост базы данных.", "PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL", "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.", "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle", "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL", "DB Error: \"%s\"" => "Ошибка БД: \"%s\"", +"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"", "MySQL user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже существует.", "Drop this user from MySQL" => "Удалить этого пользователя из MySQL", "MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует", "Drop this user from MySQL." => "Удалить этого пользователя из MySQL.", +"Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s", +"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." => "Пожалуйста, дважды просмотрите инструкции по установке.", "seconds ago" => "менее минуты", "1 minute ago" => "1 минуту назад", "%d minutes ago" => "%d минут назад", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index b97dfdc38bb..8ceb90dd763 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -37,19 +37,28 @@ "__language_name__" => "Deutsch (Förmlich: Sie)", "Security Warning" => "Sicherheitshinweis", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.", +"Setup Warning" => "Einrichtungswarnung", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "Locale not working" => "Lokalisierung funktioniert nicht", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", +"Internet connection not working" => "Keine Netzwerkverbindung", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", "Enable Share API" => "Teilen-API aktivieren", "Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen", "Allow links" => "Links erlauben", "Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen", -"Allow resharing" => "Erlaube weiterteilen", +"Allow resharing" => "Erlaube weiterverteilen", +"Allow users to share items shared with them again" => "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen", +"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu teilen", +"Allow users to only share with users in their groups" => "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen", "Security" => "Sicherheit", "Enforce HTTPS" => "HTTPS erzwingen", "Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden.", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 66d9d92ca30..18417935285 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -13,18 +13,32 @@ "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." => "Αδυναμία ενημέρωσης εφαρμογής", "Disable" => "Απενεργοποίηση", "Enable" => "Ενεργοποίηση", +"Please wait...." => "Παρακαλώ περιμένετε...", +"Updating...." => "Ενημέρωση...", +"Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής", "Error" => "Σφάλμα", +"Updated" => "Ενημερώθηκε", "Saving..." => "Αποθήκευση...", "deleted" => "διαγράφηκε", "undo" => "αναίρεση", +"Unable to remove user" => "Αδυναμία αφαίρεση χρήστη", "Groups" => "Ομάδες", "Group Admin" => "Ομάδα Διαχειριστών", "Delete" => "Διαγραφή", +"add group" => "προσθήκη ομάδας", +"Error creating user" => "Σφάλμα δημιουργίας χρήστη", "__language_name__" => "__όνομα_γλώσσας__", "Security Warning" => "Προειδοποίηση Ασφαλείας", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.", +"Setup Warning" => "Ρύθμιση Προειδοποίησης", +"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." => "Ελέγξτε ξανά τις οδηγίες εγκατάστασης.", +"Cron" => "Cron", +"Security" => "Ασφάλεια", +"Log" => "Καταγραφές", "More" => "Περισσότερα", "Version" => "Έκδοση", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Αναπτύχθηκε από την κοινότητα ownCloud, ο πηγαίος κώδικας είναι υπό άδεια χρήσης AGPL.", @@ -41,6 +55,7 @@ "Bugtracker" => "Bugtracker", "Commercial Support" => "Εμπορική Υποστήριξη", "You have used %s of the available %s" => "Χρησιμοποιήσατε %s από διαθέσιμα %s", +"Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας", "Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι", "Password" => "Συνθηματικό", "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει", diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 94c9fe55e27..105e2aa92ac 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -43,6 +43,7 @@ "Module 'fileinfo' missing" => "'fileinfo' Modulua falta da", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.", "Locale not working" => "Lokala ez dabil", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "OwnClud zerbitzari honek ezin du sistemaren lokala \"en_US.UTF-8\"/\"en.US.UTF-8\" ezarri. Honek esan nahi du fitxategi izen batzuekin arazoak egon daitezkeela. Aholkatzen dugu zure sistemak en_US.UTF-8/en_US.UTF8 lokala onartzeko behar diren paketeak instala ditzazun.", "Internet connection not working" => "Interneteko konexioak ez du funtzionatzen", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.", "Cron" => "Cron", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index 6452a75f6cb..f6b0943c53f 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -1,6 +1,7 @@ "Non foi posíbel cargar a lista desde a App Store", "Authentication error" => "Produciuse un erro de autenticación", +"Unable to change display name" => "Non é posíbel cambiar o nome visíbel", "Group already exists" => "O grupo xa existe", "Unable to add group" => "Non é posíbel engadir o grupo", "Could not enable app. " => "Non é posíbel activar o aplicativo.", @@ -41,7 +42,14 @@ "Please double check the installation guides." => "Volva comprobar as guías de instalación", "Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.", +"Locale not working" => "A configuración rexional non funciona", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a «en_US.UTF-8\"/\"en_US.UTF8». Isto significa que poden xurdir problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que instale os paquetes necesarios no sistema para admitir en_US.UTF-8/en_US.UTF8.", +"Internet connection not working" => "A conexión á Internet non funciona", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud.", +"Cron" => "Cron", "Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto.", "Sharing" => "Compartindo", "Enable Share API" => "Activar o API para compartir", "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir", @@ -82,6 +90,9 @@ "New password" => "Novo contrasinal", "Change password" => "Cambiar o contrasinal", "Display Name" => "Amosar o nome", +"Your display name was changed" => "O seu nome visíbel foi cambiado", +"Unable to change your display name" => "Non é posíbel cambiar o seu nome visíbel", +"Change display name" => "Cambiar o nome visíbel", "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 a recuperación do contrasinal", @@ -95,6 +106,7 @@ "Unlimited" => "Sen límites", "Other" => "Outro", "Storage" => "Almacenamento", +"change display name" => "cambiar o nome visíbel", "set new password" => "estabelecer un novo contrasinal", "Default" => "Predeterminado" ); diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 393993fa611..e597809e98c 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -32,6 +32,8 @@ "__language_name__" => "Русский ", "Security Warning" => "Предупреждение безопасности", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.", +"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." => "Пожалуйста, дважды просмотрите инструкции по установке.", "More" => "Больше", "Version" => "Версия", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL.", diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index 88eb956fe8e..0b9d2d3d023 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -24,10 +24,13 @@ "Error" => "錯誤", "Updated" => "已更新", "Saving..." => "儲存中...", +"deleted" => "已刪除", "undo" => "復原", +"Unable to remove user" => "無法刪除用戶", "Groups" => "群組", "Group Admin" => "群組 管理員", "Delete" => "刪除", +"add group" => "新增群組", "__language_name__" => "__語言_名稱__", "Security Warning" => "安全性警告", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。", -- GitLab From a984a27fa09adf24e6b846ec3e412b8d7d95e532 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 18 Feb 2013 08:04:35 +0100 Subject: [PATCH 069/353] Sanitize user input --- settings/js/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/users.js b/settings/js/users.js index 086b0884a3b..63a62049839 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -182,7 +182,7 @@ var UserList = { var addGroup = function (select, group) { $('select[multiple]').each(function (index, element) { if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) { - $(element).append(''); + $(element).append(''); } }) }; -- GitLab From 79284b8e574a21fae21ca68b9863f3205200333a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 18 Feb 2013 08:11:59 +0100 Subject: [PATCH 070/353] Sanitize HTML --- apps/files_external/templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index d7a4dd5150d..3709fd2e51d 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -18,7 +18,7 @@ $mount): ?> > -- GitLab From efa024cc62a7a587ddb493287f0d8554c2342338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 18 Feb 2013 11:19:40 +0100 Subject: [PATCH 071/353] fix getUidAndFilename() function --- apps/files_versions/appinfo/app.php | 2 +- apps/files_versions/lib/versions.php | 67 +++++++++------------------- 2 files changed, 23 insertions(+), 46 deletions(-) diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index f7c6989ce2d..1fa63ced5e8 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -12,5 +12,5 @@ OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook"); // Listen to delete and rename signals -OCP\Util::connectHook('OC_Filesystem', 'post-delete', "OCA\Files_Versions\Hooks", "remove_hook"); +OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook"); OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook"); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index c537fcf3519..1e9dc0a92af 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -35,48 +35,26 @@ class Storage { 'step' => 604800), ); - private static function getUidAndFilename($filename) - { - if (\OCP\App::isEnabled('files_sharing') - && substr($filename, 0, 7) == '/Shared' - && $source = \OCP\Share::getItemSharedWith('file', - substr($filename, 7), - \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) { - $filename = $source['path']; - $pos = strpos($filename, '/files', 1); - $uid = substr($filename, 1, $pos - 1); - $filename = substr($filename, $pos + 6); - } else { - $uid = \OCP\User::getUser(); + private static function getUidAndFilename($filename) { + $uid = \OC\Files\Filesystem::getOwner($filename); + if ( $uid != \OCP\User::getUser() ) { + $info = \OC\Files\Filesystem::getFileInfo($filename); + $ownerView = new \OC\Files\View('/'.$uid.'/files'); + $filename = $ownerView->getPath($info['fileid']); } return array($uid, $filename); } - + /** * store a new version of a file. */ public static function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - $owner = \OC\Files\Filesystem::getOwner($filename); - if ( $owner != \OCP\User::getUser() ) { - $datadir = \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" ); - \OC\Files\Filesystem::mount( '\OC\Files\Storage\Local', array('datadir'=>$datadir), '/'.$owner ); - $info = \OC\Files\Filesystem::getFileInfo($filename); - $id = $info['fileid']; - error_log("id: $id"); - $path = \OC\Files\Filesystem::getPath($id); - error_log("new path: $path"); - } + list($uid, $filename) = self::getUidAndFilename($filename); $files_view = new \OC\Files\View('/'.$uid .'/files'); $users_view = new \OC\Files\View('/'.$uid); - //check if source file already exist as version to avoid recursions. - // todo does this check work? - if ($users_view->file_exists($filename)) { - return false; - } - // check if filename is a directory if($files_view->is_dir($filename)) { return false; @@ -116,10 +94,10 @@ class Storage { */ public static function delete($filename) { list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC_FilesystemView('/'.$uid .'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid .'/files_versions'); $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v'; - if( ($versions = self::getVersions($filename)) ) { + if( ($versions = self::getVersions($uid, $filename)) ) { if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { $versionsSize = self::calculateSize($uid); } @@ -137,16 +115,15 @@ class Storage { public static function rename($oldpath, $newpath) { list($uid, $oldpath) = self::getUidAndFilename($oldpath); list($uidn, $newpath) = self::getUidAndFilename($newpath); - $versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions'); - $files_view = new \OC_FilesystemView('/'.$uid .'/files'); + $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); + $files_view = new \OC\Files\View('/'.$uid .'/files'); $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath; if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); - } else if ( ($versions = Storage::getVersions($oldpath)) ) { + } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) { $info=pathinfo($abs_newpath); if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); - $versions = Storage::getVersions($oldpath); foreach ($versions as $v) { $versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']); } @@ -187,14 +164,14 @@ class Storage { /** * @brief get a list of all available versions of a file in descending chronological order + * @param $uid user id from the owner of the file * @param $filename file to find versions of, relative to the user files dir * @param $count number of versions to return * @returns array */ - public static function getVersions( $filename, $count = 0 ) { + public static function getVersions($uid, $filename, $count = 0 ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_versions'); + $versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions'); $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); $versions = array(); @@ -203,7 +180,7 @@ class Storage { sort( $matches ); - $files_view = new \OC_FilesystemView('/'.$uid.'/files'); + $files_view = new \OC\Files\View('/'.$uid.'/files'); $local_file = $files_view->getLocalFile($filename); $local_file_md5 = \md5_file( $local_file ); @@ -254,7 +231,7 @@ class Storage { */ private static function calculateSize($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); @@ -279,7 +256,7 @@ class Storage { */ private static function getAllVersions($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); @@ -325,7 +302,7 @@ class Storage { private static function expire($filename, $versionsSize = null) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); // get available disk space for user $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($uid, 'files', 'quota')); @@ -344,7 +321,7 @@ class Storage { } // calculate available space for version history - $files_view = new \OC_FilesystemView('/'.$uid.'/files'); + $files_view = new \OC\Files\View('/'.$uid.'/files'); $rootInfo = $files_view->getFileInfo('/'); $free = $quota-$rootInfo['size']; // remaining free space for user if ( $free > 0 ) { @@ -360,7 +337,7 @@ class Storage { $versions_by_file = $result['by_file']; $all_versions = $result['all']; } else { - $all_versions = Storage::getVersions($filename); + $all_versions = Storage::getVersions($uid, $filename); $versions_by_file[$filename] = $all_versions; } -- GitLab From fde0a8b520203aee9800959847ff3bf4ec53250f Mon Sep 17 00:00:00 2001 From: VicDeo Date: Mon, 18 Feb 2013 13:22:43 +0300 Subject: [PATCH 072/353] Add Ability to the app to detect more details on the file --- apps/files/js/files.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 918182162d4..8327460cca6 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -162,9 +162,10 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file',filename); var renaming=tr.data('renaming'); if(!renaming && !FileList.isLoading(filename)){ - var mime=$(this).parent().parent().data('mime'); - var type=$(this).parent().parent().data('type'); - var permissions = $(this).parent().parent().data('permissions'); + FileActions.currentFile = $(this).parent(); + var mime=FileActions.getCurrentMimeType(); + var type=FileActions.getCurrentType(); + var permissions = FileActions.getCurrentPermissions(); var action=FileActions.getDefault(mime,type, permissions); if(action){ event.preventDefault(); -- GitLab From 4a3374ecf86d21b5769eeae26b32a151025f2584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 18 Feb 2013 14:38:29 +0100 Subject: [PATCH 073/353] fix redirect, use the new routing --- apps/files_external/ajax/addRootCertificate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index 7794238ab36..43fd6752c4a 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -37,5 +37,5 @@ if ( $isValid ) { OCP\Util::WARN); } -header('Location: settings/personal.php'); +header('Location:' . OCP\Util::linkToRoute( "settings_personal" )); exit; -- GitLab From c0ac98066e717ac8dba98df5bbfe881c9b344495 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 18 Feb 2013 09:49:50 -0500 Subject: [PATCH 074/353] check filename and timestamp in Trashbin's file_exists method --- apps/files_trashbin/lib/trash.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8cb44d0a684..a948b47e0ad 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -249,13 +249,21 @@ class Trashbin { /** * check to see whether a file exists in trashbin - * @param $file path to the file to check + * @param $filename path to the file + * @param $timestamp of deletion time * @return true if file exists, otherwise false */ - public static function file_exists($file) { + public static function file_exists($filename, $timestamp=null) { $user = \OCP\User::getUser(); $view = new \OC_FilesystemView('/'.$user); - $target = \OC_Filesystem::normalizePath('files_trashbin/'.$file); + + if ($timestamp) { + $filename = $filename.'.d'.$timestamp; + } else { + $filename = $filename; + } + + $target = \OC_Filesystem::normalizePath('files_trashbin/'.$filename); return $view->file_exists($target); } -- GitLab From 37352bba96033069107ca791b10b71c9505ca5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 18 Feb 2013 18:16:19 +0100 Subject: [PATCH 075/353] close file handler after readdir() --- apps/files_trashbin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index a2d4cc0a44d..5d6b5d94e5c 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -37,7 +37,7 @@ if ($dir) { ); } } - closedir($fullpath); + closedir($dirContent); } else { $dirlisting = false; -- GitLab From c5f6a77dbd4480874a1907dec1ad222e03713b22 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 18 Feb 2013 21:15:32 +0300 Subject: [PATCH 076/353] Correct new password input name --- settings/templates/personal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 6b3e8acbf02..6e9ad5e1acb 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -37,7 +37,7 @@ if($_['passwordChangeSupported']) {
    t('Your password was changed');?>
    t('Unable to change your password');?>
    - + -- GitLab From 06dbcec5a17691d7d31e52cabba94316f040f13b Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 18 Feb 2013 21:20:48 +0300 Subject: [PATCH 077/353] Do not set password if it has't provided --- settings/ajax/changepassword.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index ceb4bbeecb0..1fc6d0e1000 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn(); OC_APP::loadApps(); $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser(); -$password = $_POST["password"]; +$password = isset($_POST["password"]) ? $_POST["password"] : null; $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:''; $userstatus = null; @@ -28,7 +28,7 @@ if(is_null($userstatus)) { } // Return Success story -if( OC_User::setPassword( $username, $password )) { +if(!is_null($password) && OC_User::setPassword( $username, $password )) { OC_JSON::success(array("data" => array( "username" => $username ))); } else{ -- GitLab From e2f87e456f05ecafeefff29a1e2bf996f692a050 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 18 Feb 2013 23:48:08 +0300 Subject: [PATCH 078/353] Calculate size for existing directories only --- apps/files_trashbin/lib/trash.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 76844ca92e9..fbc3954c040 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -396,6 +396,9 @@ class Trashbin { */ private static function calculateSize($view) { $root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath(''); + if (!file_exists($root)) { + return 0; + } $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST); $size = 0; -- GitLab From f343d9d247eca8deb69aa521d17ed46dced4f519 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 18 Feb 2013 23:04:22 +0100 Subject: [PATCH 079/353] files_versions no longer contains a personal settings page -> remove the call --- apps/files_versions/appinfo/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index f7c6989ce2d..9e3e81c580a 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -5,7 +5,6 @@ OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; OCP\App::registerAdmin('files_versions', 'settings'); -OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\Util::addscript('files_versions', 'versions'); -- GitLab From 2c78c5ccab763a74210ec8684f4582d0972e694e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 18 Feb 2013 18:05:58 -0500 Subject: [PATCH 080/353] bug fix for issue 1739, two changes included: * fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause * check array_diff return value in OC_Group::displayNamesInGroups, when there is no difference between two arrays, it will return NULL, so we have to take care of it. --- lib/group.php | 15 ++++++++------- lib/group/database.php | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/group.php b/lib/group.php index 6afe1440030..8c06ddc0fd0 100644 --- a/lib/group.php +++ b/lib/group.php @@ -308,15 +308,16 @@ class OC_Group { * @return array with display names (Key) user ids (value) */ public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) { - $displayNames = array(); + $displayNames = array(); foreach ($gids as $gid) { // TODO Need to apply limits to groups as total - $displayNames = array_merge( - array_diff( - self::displayNamesInGroup($gid, $search, $limit, $offset), - $displayNames - ), - $displayNames); + $diff = array_diff( + self::displayNamesInGroup($gid, $search, $limit, $offset), + $displayNames + ); + if ($diff) { + $displayNames = array_merge($diff, $displayNames); + } } return $displayNames; } diff --git a/lib/group/database.php b/lib/group/database.php index 8816dd8169c..93dc05c53a1 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend { $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' .' FROM `*PREFIX*users`' .' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`' - .' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?', + .' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?', $limit, $offset); $result = $stmt->execute(array($gid, $search.'%')); -- GitLab From 76c4dc62964516852f88f251b49bef5e17153fcb Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 19 Feb 2013 00:06:51 +0100 Subject: [PATCH 081/353] [tx-robot] updated from transifex --- apps/files/l10n/fr.php | 1 + apps/files/l10n/tr.php | 9 +- apps/files/l10n/uk.php | 5 + apps/files_encryption/l10n/tr.php | 3 + apps/files_encryption/l10n/uk.php | 3 + apps/files_external/l10n/tr.php | 6 + apps/files_trashbin/l10n/tr.php | 9 +- apps/files_versions/l10n/tr.php | 7 ++ apps/user_ldap/l10n/de_DE.php | 6 +- apps/user_ldap/l10n/pt_BR.php | 24 ++++ apps/user_ldap/l10n/tr.php | 16 ++- apps/user_ldap/l10n/uk.php | 12 ++ apps/user_webdavauth/l10n/tr.php | 1 + apps/user_webdavauth/l10n/uk.php | 4 +- core/l10n/pl.php | 6 + core/l10n/tr.php | 7 ++ core/l10n/uk.php | 3 + l10n/ca/settings.po | 14 +-- l10n/de_DE/settings.po | 12 +- l10n/de_DE/user_ldap.po | 123 +++++++++++---------- l10n/es_AR/lib.po | 12 +- l10n/es_AR/settings.po | 10 +- l10n/fr/files.po | 9 +- l10n/fr/settings.po | 15 +-- l10n/pl/core.po | 19 ++-- l10n/pt_BR/user_ldap.po | 165 ++++++++++++++-------------- l10n/ru/settings.po | 68 ++++++------ l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 6 +- 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 | 21 ++-- l10n/tr/files.po | 21 ++-- l10n/tr/files_encryption.po | 13 ++- l10n/tr/files_external.po | 25 +++-- l10n/tr/files_trashbin.po | 21 ++-- l10n/tr/files_versions.po | 21 ++-- l10n/tr/settings.po | 16 +-- l10n/tr/user_ldap.po | 139 +++++++++++------------ l10n/tr/user_webdavauth.po | 11 +- l10n/uk/core.po | 12 +- l10n/uk/files.po | 16 +-- l10n/uk/files_encryption.po | 13 ++- l10n/uk/lib.po | 64 +++++------ l10n/uk/settings.po | 86 +++++++-------- l10n/uk/user_ldap.po | 140 +++++++++++------------ l10n/uk/user_webdavauth.po | 13 ++- lib/l10n/es_AR.php | 3 + lib/l10n/uk.php | 2 + settings/l10n/de_DE.php | 6 +- settings/l10n/es_AR.php | 2 + settings/l10n/fr.php | 4 + settings/l10n/ru.php | 31 ++++++ settings/l10n/tr.php | 1 + settings/l10n/uk.php | 35 ++++++ 62 files changed, 752 insertions(+), 559 deletions(-) diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index e2af33da77f..e8d65ccb3e5 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -60,6 +60,7 @@ "Text file" => "Fichier texte", "Folder" => "Dossier", "From link" => "Depuis le lien", +"Deleted files" => "Fichiers supprimés", "Cancel upload" => "Annuler l'envoi", "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", "Download" => "Télécharger", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index f6943f1f4d1..3dbc8ec7a22 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -10,8 +10,10 @@ "No file was uploaded" => "Hiç dosya yüklenmedi", "Missing a temporary folder" => "Geçici bir klasör eksik", "Failed to write to disk" => "Diske yazılamadı", +"Not enough storage available" => "Yeterli disk alanı yok", "Invalid directory." => "Geçersiz dizin.", "Files" => "Dosyalar", +"Delete permanently" => "Kalıcı olarak sil", "Delete" => "Sil", "Rename" => "İsim değiştir.", "Pending" => "Bekliyor", @@ -22,9 +24,12 @@ "replaced {new_name}" => "değiştirilen {new_name}", "undo" => "geri al", "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi", +"perform delete operation" => "Silme işlemini gerçekleştir", "'.' 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.", +"Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek.", +"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.", "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi", "Upload Error" => "Yükleme hatası", @@ -55,6 +60,7 @@ "Text file" => "Metin dosyası", "Folder" => "Klasör", "From link" => "Bağlantıdan", +"Deleted files" => "Dosyalar silindi", "Cancel upload" => "Yüklemeyi iptal et", "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!", "Download" => "İndir", @@ -62,5 +68,6 @@ "Upload too large" => "Yüklemeniz çok büyük", "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" +"Current scanning" => "Güncel tarama", +"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor" ); diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 7e499e6c2c8..20eb355e42d 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -1,4 +1,7 @@ "Не вдалося перемістити %s - Файл з таким ім'ям вже існує", +"Could not move %s" => "Не вдалося перемістити %s", +"Unable to rename file" => "Не вдалося перейменувати файл", "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: ", @@ -7,6 +10,7 @@ "No file was uploaded" => "Не відвантажено жодного файлу", "Missing a temporary folder" => "Відсутній тимчасовий каталог", "Failed to write to disk" => "Невдалося записати на диск", +"Not enough storage available" => "Місця більше немає", "Invalid directory." => "Невірний каталог.", "Files" => "Файли", "Delete permanently" => "Видалити назавжди", @@ -56,6 +60,7 @@ "Text file" => "Текстовий файл", "Folder" => "Папка", "From link" => "З посилання", +"Deleted files" => "Видалено файлів", "Cancel upload" => "Перервати завантаження", "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!", "Download" => "Завантажити", diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php index 0868d0a6905..6b42c757e65 100644 --- a/apps/files_encryption/l10n/tr.php +++ b/apps/files_encryption/l10n/tr.php @@ -1,4 +1,7 @@ "Şifreleme", +"File encryption is enabled." => "Dosya şifreleme aktif.", +"The following file types will not be encrypted:" => "Belirtilen dosya tipleri şifrelenmeyecek:", +"Exclude the following file types from encryption:" => "Seçilen dosya tiplerini şifreleme:", "None" => "Hiçbiri" ); diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php index 8236c5afefd..d4957141191 100644 --- a/apps/files_encryption/l10n/uk.php +++ b/apps/files_encryption/l10n/uk.php @@ -1,4 +1,7 @@ "Шифрування", +"File encryption is enabled." => "Увімкнуто шифрування файлів.", +"The following file types will not be encrypted:" => "Такі типи файлів шифруватись не будуть:", +"Exclude the following file types from encryption:" => "Виключити наступні типи файлів з ​​шифрування:", "None" => "Жоден" ); diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php index e9a045aab57..bbe6f5b6bec 100644 --- a/apps/files_external/l10n/tr.php +++ b/apps/files_external/l10n/tr.php @@ -1,4 +1,8 @@ "Giriş kabul edildi", +"Grant access" => "Erişim sağlandı", +"Fill out all required fields" => "Doldurulması zorunlu alanları doldur", +"Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz", "External Storage" => "Harici Depolama", "Mount point" => "Bağlama Noktası", "Backend" => "Yönetici", @@ -11,6 +15,8 @@ "Groups" => "Gruplar", "Users" => "Kullanıcılar", "Delete" => "Sil", +"Enable User External Storage" => "Kullanıcılar için Harici Depolamayı Etkinleştir", +"Allow users to mount their own external storage" => "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver", "SSL root certificates" => "SSL kök sertifikaları", "Import Root Certificate" => "Kök Sertifikalarını İçe Aktar" ); diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php index 5b7064eceaf..cebe615a05f 100644 --- a/apps/files_trashbin/l10n/tr.php +++ b/apps/files_trashbin/l10n/tr.php @@ -1,7 +1,14 @@ "%s Kalıcı olarak silinemedi", +"Couldn't restore %s" => "%s Geri yüklenemedi", +"perform restore operation" => "Geri yükleme işlemini gerçekleştir", +"delete file permanently" => "Dosyayı kalıcı olarak sil", "Name" => "İsim", +"Deleted" => "Silindi", "1 folder" => "1 dizin", "{count} folders" => "{count} dizin", "1 file" => "1 dosya", -"{count} files" => "{count} dosya" +"{count} files" => "{count} dosya", +"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.", +"Restore" => "Geri yükle" ); diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php index e9a4c4702e1..3db3a4bc822 100644 --- a/apps/files_versions/l10n/tr.php +++ b/apps/files_versions/l10n/tr.php @@ -1,4 +1,11 @@ "Geri alınamıyor: %s", +"success" => "Başarılı.", +"File %s was reverted to version %s" => "Dosya %s, %s versiyonuna döndürüldü", +"failure" => "hata", +"File %s could not be reverted to version %s" => "Dosya %s, %s versiyonuna döndürülemedi.", +"No old versions available" => "Eski versiyonlar mevcut değil.", +"No path specified" => "Yama belirtilmemiş", "History" => "Geçmiş", "Files Versioning" => "Dosya Sürümleri", "Enable" => "Etkinleştir" diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 45edda2debb..9bee0a219ae 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -38,12 +38,12 @@ "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", "Port" => "Port", "Backup (Replica) Host" => "Back-Up (Replikation) Host", -"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein.", +"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 ein Replikat des Haupt- LDAP/AD Servers sein.", "Backup (Replica) Port" => "Back-Up (Replikation) Port", "Disable Main Server" => "Hauptserver deaktivieren", -"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden.", +"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden.", "Use TLS" => "Nutze TLS", -"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index dd4019fc35e..c86263d52a8 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -1,12 +1,23 @@ "Falha ao deletar a configuração do servidor", +"The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes.", "Deletion failed" => "Remoção falhou", "Keep settings?" => "Manter ajustes?", +"Cannot add server configuration" => "Não foi possível adicionar a configuração do servidor", +"Connection test succeeded" => "Teste de conexão bem sucedido", +"Connection test failed" => "Teste de conexão falhou", +"Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?", "Confirm Deletion" => "Confirmar Exclusão", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Aviso: Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Aviso: O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.", +"Server configuration" => "Configuração de servidor", +"Add Server Configuration" => "Adicionar configuração de servidor", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://", "Base DN" => "DN Base", +"One Base DN per line" => "Uma base DN por linha", "You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada", "User DN" => "DN Usuário", "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." => "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios.", @@ -21,20 +32,33 @@ "Group Filter" => "Filtro de Grupo", "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar ao obter grupos.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\"", +"Connection Settings" => "Configurações de conexão", +"Configuration Active" => "Configuração ativa", +"When unchecked, this configuration will be skipped." => "Quando assinalada, esta configuração será pulada.", "Port" => "Porta", +"Disable Main Server" => "Desativar Servidor Principal", +"When switched on, ownCloud will only connect to the replica server." => "Quando ativado, ownCloud somente conectar-se-á ao servidor réplica.", "Use TLS" => "Usar TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.", "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)", "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud.", "Not recommended, use for testing only." => "Não recomendado, use somente para testes.", "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.", +"Directory Settings" => "Configurações de Diretório", "User Display Name Field" => "Campo Nome de Exibição de Usuário", "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do usuário.", "Base User Tree" => "Árvore de Usuário Base", +"One User Base DN per line" => "Um usuário-base DN por linha", +"User Search Attributes" => "Atributos de busca de usuário", +"Optional; one attribute per line" => "Opcional; um atributo por linha", "Group Display Name Field" => "Campo Nome de Exibição de Grupo", "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do grupo.", "Base Group Tree" => "Árvore de Grupo Base", +"One Group Base DN per line" => "Um grupo-base DN por linha", +"Group Search Attributes" => "Atributos de busca de grupo", "Group-Member association" => "Associação Grupo-Membro", +"Special Attributes" => "Atributos Especiais", "in bytes" => "em bytes", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.", "Help" => "Ajuda" diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php index 1bed9e246c9..7bcabb0448a 100644 --- a/apps/user_ldap/l10n/tr.php +++ b/apps/user_ldap/l10n/tr.php @@ -1,16 +1,22 @@ "Silme başarısız oldu", -"Host" => "Konak", -"Base DN" => "Base DN", -"User DN" => "User DN", +"Keep settings?" => "Ayarları kalsınmı?", +"Connection test succeeded" => "Bağlantı testi başarılı oldu", +"Connection test failed" => "Bağlantı testi başarısız oldu", +"Confirm Deletion" => "Silmeyi onayla", +"Host" => "Sunucu", +"Base DN" => "Ana DN", +"User DN" => "Kullanıcı DN", "Password" => "Parola", "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.", -"User Login Filter" => "Kullanıcı Oturum Açma Süzgeci", +"User Login Filter" => "Kullanıcı Oturum Filtresi", "use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"", -"User List Filter" => "Kullanıcı Liste Süzgeci", +"User List Filter" => "Kullanıcı Liste Filtresi", "without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"", "Group Filter" => "Grup Süzgeci", +"Connection Settings" => "Bağlantı ayarları", "Port" => "Port", +"Disable Main Server" => "Ana sunucuyu devredışı birak", "Use TLS" => "TLS kullan", "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.", "Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.", diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index 643a7495890..3b85e095ff0 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -33,24 +33,36 @@ "Group Filter" => "Фільтр Груп", "Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".", +"Connection Settings" => "Налаштування З'єднання", "Configuration Active" => "Налаштування Активне", "When unchecked, this configuration will be skipped." => "Якщо \"галочка\" знята, ця конфігурація буде пропущена.", "Port" => "Порт", +"Backup (Replica) Host" => "Сервер для резервних копій", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.", +"Backup (Replica) Port" => "Порт сервера для резервних копій", +"Disable Main Server" => "Вимкнути Головний Сервер", +"When switched on, ownCloud will only connect to the replica server." => "Коли увімкнуто, ownCloud буде приєднуватись лише до сервера з резервними копіями.", "Use TLS" => "Використовуйте TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде.", "Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)", "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер.", "Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.", "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.", +"Directory Settings" => "Налаштування Каталога", "User Display Name Field" => "Поле, яке відображає Ім'я Користувача", "The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud.", "Base User Tree" => "Основне Дерево Користувачів", "One User Base DN per line" => "Один Користувач Base DN на одній строчці", +"User Search Attributes" => "Пошукові Атрибути Користувача", +"Optional; one attribute per line" => "Додатково; один атрибут на строчку", "Group Display Name Field" => "Поле, яке відображає Ім'я Групи", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен груп ownCloud.", "Base Group Tree" => "Основне Дерево Груп", "One Group Base DN per line" => "Одна Група Base DN на одній строчці", +"Group Search Attributes" => "Пошукові Атрибути Групи", "Group-Member association" => "Асоціація Група-Член", +"Special Attributes" => "Спеціальні Атрибути", "in bytes" => "в байтах", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.", "Help" => "Допомога" diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php index 245a5101341..4a2f6d2403b 100644 --- a/apps/user_webdavauth/l10n/tr.php +++ b/apps/user_webdavauth/l10n/tr.php @@ -1,3 +1,4 @@ "WebDAV Kimlik doğrulaması", "URL: http://" => "URL: http://" ); diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php index 245a5101341..66887df54b5 100644 --- a/apps/user_webdavauth/l10n/uk.php +++ b/apps/user_webdavauth/l10n/uk.php @@ -1,3 +1,5 @@ "URL: http://" +"WebDAV Authentication" => "Аутентифікація WebDAV", +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud надішле облікові дані на цей URL. Цей плагін перевірить відповідь і буде інтерпретувати HTTP коди 401 і 403 як повідомлення про недійсні повноваження, а решту відповідей як дійсні облікові дані." ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 8f548fe5be6..0f23d573fc6 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s", "Category type not provided." => "Typ kategorii nie podany.", "No category to add?" => "Brak kategorii", +"This category already exists: %s" => "Ta kategoria już istnieje: %s", "Object type not provided." => "Typ obiektu nie podany.", "%s ID not provided." => "%s ID nie podany.", "Error adding %s to favorites." => "Błąd dodania %s do ulubionych.", @@ -83,6 +84,8 @@ "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia", "Sending ..." => "Wysyłanie...", "Email sent" => "Wyślij Email", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Aktualizacja zakończyła się niepowodzeniem. Proszę zgłosić ten problem spoleczności ownCloud.", +"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", "ownCloud password reset" => "restart hasła", "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}", "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", @@ -106,6 +109,8 @@ "Security Warning" => "Ostrzeżenie o zabezpieczeniach", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", +"For information how to properly configure your server, please see the documentation." => "W celu uzyskania informacji dotyczących prawidłowego skonfigurowania serwera sięgnij do dokumentacji.", "Create an admin account" => "Tworzenie konta administratora", "Advanced" => "Zaawansowane", "Data folder" => "Katalog danych", @@ -125,6 +130,7 @@ "Lost your password?" => "Nie pamiętasz hasła?", "remember" => "Zapamiętanie", "Log in" => "Zaloguj", +"Alternative Logins" => "Alternatywne loginy", "prev" => "wstecz", "next" => "naprzód", "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę." diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 201b511647c..9d9ff0e7eba 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir", "Category type not provided." => "Kategori türü desteklenmemektedir.", "No category to add?" => "Eklenecek kategori yok?", +"This category already exists: %s" => "Bu kategori zaten mevcut: %s", "Object type not provided." => "Nesne türü desteklenmemektedir.", "%s ID not provided." => "%s ID belirtilmedi.", "Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu", @@ -52,6 +53,7 @@ "Error" => "Hata", "The app name is not specified." => "uygulama adı belirtilmedi.", "The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.", +"Shared" => "Paylaşılan", "Share" => "Paylaş", "Error while sharing" => "Paylaşım sırasında hata ", "Error while unsharing" => "Paylaşım iptal ediliyorken hata", @@ -82,6 +84,8 @@ "Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası", "Sending ..." => "Gönderiliyor...", "Email sent" => "Eposta gönderildi", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin ownCloud community.", +"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.", "ownCloud password reset" => "ownCloud parola sıfırlama", "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}", "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.", @@ -105,6 +109,8 @@ "Security Warning" => "Güvenlik Uyarisi", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.", +"For information how to properly configure your server, please see the documentation." => "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen bu linki ziyaret edin documentation.", "Create an admin account" => "Bir yönetici hesabı oluşturun", "Advanced" => "Gelişmiş", "Data folder" => "Veri klasörü", @@ -124,6 +130,7 @@ "Lost your password?" => "Parolanızı mı unuttunuz?", "remember" => "hatırla", "Log in" => "Giriş yap", +"Alternative Logins" => "Alternatif Girişler", "prev" => "önceki", "next" => "sonraki", "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir." diff --git a/core/l10n/uk.php b/core/l10n/uk.php index a2f297fc224..685a31d52ed 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s", "Category type not provided." => "Не вказано тип категорії.", "No category to add?" => "Відсутні категорії для додавання?", +"This category already exists: %s" => "Ця категорія вже існує: %s", "Object type not provided." => "Не вказано тип об'єкту.", "%s ID not provided." => "%s ID не вказано.", "Error adding %s to favorites." => "Помилка при додаванні %s до обраного.", @@ -108,6 +109,8 @@ "Security Warning" => "Попередження про небезпеку", "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" => "Каталог даних", diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 2ea7c2f7f04..1086f12301d 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/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-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 11:54+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" @@ -151,23 +151,23 @@ msgstr "Grup Admin" msgid "Delete" msgstr "Suprimeix" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "afegeix grup" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "Heu de facilitar un nom d'usuari vàlid" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "Error en crear l'usuari" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "Heu de facilitar una contrasenya vàlida" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Català" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 9fe6f6813a9..ad5f7571a56 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -30,9 +30,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-16 23:40+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 14:18+0000\n" +"Last-Translator: robN \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,7 +137,7 @@ msgstr "Fehler" #: js/apps.js:90 msgid "Updated" -msgstr "Geupdated" +msgstr "Aktualisiert" #: js/personal.js:96 msgid "Saving..." @@ -250,7 +250,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." +msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." #: templates/admin.php:89 msgid "Cron" @@ -270,7 +270,7 @@ msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite i msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf." +msgstr "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf." #: templates/admin.php:125 msgid "Sharing" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index a2eb0d878ec..90f63eae9cd 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -10,6 +10,7 @@ # Maurice Preuß <>, 2012. # , 2012. # Phi Lieb <>, 2012. +# , 2013. # , 2013. # Susi <>, 2013. # , 2012. @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 23:20+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 14:19+0000\n" +"Last-Translator: robN \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,17 +33,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "Das Löschen der Server-Konfiguration schlug fehl" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -97,224 +98,224 @@ msgstr "Warnung: Da das PHP-Modul für LDAP ist nicht installiert, das Ba msgid "Server configuration" msgstr "Serverkonfiguration" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "Serverkonfiguration hinzufügen" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Host" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "Ein Base DN pro Zeile" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Passwort" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "Konfiguration aktiv" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Port" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "Back-Up (Replikation) Host" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein." +msgstr "Geben Sie einen optionalen Backup Host an. Es muss ein Replikat des Haupt- LDAP/AD Servers sein." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "Back-Up (Replikation) Port" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" msgstr "Hauptserver deaktivieren" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden." +msgstr "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern." +msgstr "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" msgstr "Verzeichniseinstellungen" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "Ein Benutzer Base DN pro Zeile" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "Benutzer-Suche Eigenschaften" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "Optional; Ein Attribut pro Zeile" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "Ein Gruppen Base DN pro Zeile" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "Gruppen-Suche Eigenschaften" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "Besondere Eigenschaften" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Hilfe" diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po index a997d69e93d..2f2831a8d4b 100644 --- a/l10n/es_AR/lib.po +++ b/l10n/es_AR/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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 20:50+0000\n" -"Last-Translator: deftoner \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 10:20+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" @@ -131,7 +131,7 @@ msgstr "Debe ingresar una cuenta existente o el administrador" #: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "El nombre de usuario y contraseña no son válidos" #: setup.php:203 msgid "MySQL username and/or password not valid" @@ -150,7 +150,7 @@ msgstr "Error DB: \"%s\"" #: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "El comando no comprendido es: \"%s\"" #: setup.php:273 #, php-format @@ -173,7 +173,7 @@ msgstr "Borrar este usuario de MySQL" #: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"" #: setup.php:649 msgid "" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 87ad26cb9c4..968b373574a 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/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-02-16 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:10+0000\n" -"Last-Translator: Javier Victor Mariano Bruno \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 10:20+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" @@ -231,7 +231,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características de ownCloud." #: templates/admin.php:89 msgid "Cron" @@ -245,7 +245,7 @@ msgstr "Ejecute una tarea con cada pagina cargada." msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http." #: templates/admin.php:118 msgid "" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 9e0b0e3a7ae..9370bbceb44 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Adalberto Rodrigues , 2013. # Cédric MARTIN , 2013. # Christophe Lherieau , 2012-2013. # Cyril Glapa , 2012. @@ -21,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 11:12+0000\n" +"Last-Translator: Adalberto Rodrigues \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" @@ -288,7 +289,7 @@ msgstr "Depuis le lien" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Fichiers supprimés" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 3681ab7e403..7eb6c479f21 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Adalberto Rodrigues , 2013. # Brice , 2012. # Cédric MARTIN , 2013. # Cyril Glapa , 2012. @@ -24,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" -"PO-Revision-Date: 2013-02-16 19:10+0000\n" -"Last-Translator: Nahir Mohamed \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 14:18+0000\n" +"Last-Translator: Adalberto Rodrigues \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" @@ -197,7 +198,7 @@ msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Avertissement, problème de configuration" #: templates/admin.php:32 msgid "" @@ -292,15 +293,15 @@ msgstr "Autoriser le repartage" #: templates/admin.php:148 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux" #: templates/admin.php:155 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Autoriser les utilisateurs à partager avec tout le monde" #: templates/admin.php:158 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement" #: templates/admin.php:165 msgid "Security" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 5021e25a366..82607700c99 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,6 +9,7 @@ # , 2012. # Marcin Małecki , 2011, 2012. # Marcin Małecki , 2011. +# Marco Oliver Grunwald , 2013. # , 2011. # , 2012. # Piotr Sokół , 2012. @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:31+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 12:12+0000\n" +"Last-Translator: mgrvnwald \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" @@ -62,7 +63,7 @@ msgstr "Brak kategorii" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Ta kategoria już istnieje: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -390,11 +391,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Aktualizacja zakończyła się niepowodzeniem. Proszę zgłosić ten problem spoleczności ownCloud." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud." #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -497,14 +498,14 @@ msgstr "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa." #: templates/installation.php:32 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "W celu uzyskania informacji dotyczących prawidłowego skonfigurowania serwera sięgnij do dokumentacji." #: templates/installation.php:36 msgid "Create an admin account" @@ -587,7 +588,7 @@ msgstr "Zaloguj" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Alternatywne loginy" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index ad9f2821c0c..f3ba82a97b8 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # Rodrigo Tavares , 2013. +# Tulio Simoes Martins Padilha , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:00+0000\n" -"Last-Translator: rodrigost23 \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 14:10+0000\n" +"Last-Translator: tuliouel \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,23 +22,23 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Falha ao deletar a configuração do servidor" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "A configuração é válida e a conexão foi estabelecida!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes." #: js/settings.js:66 msgid "Deletion failed" @@ -53,19 +54,19 @@ msgstr "Manter ajustes?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Não foi possível adicionar a configuração do servidor" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Teste de conexão bem sucedido" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Teste de conexão falhou" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Você quer realmente deletar as atuais Configurações de Servidor?" #: js/settings.js:137 msgid "Confirm Deletion" @@ -86,226 +87,226 @@ msgstr "Aviso: O módulo PHP LDAP não está instalado, o backend não fu #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Configuração de servidor" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Adicionar configuração de servidor" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Host" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "DN Base" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" -msgstr "" +msgstr "Uma base DN por linha" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "DN Usuário" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Senha" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acesso anônimo, deixe DN e Senha vazios." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "Filtro de Login de Usuário" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "use %%uid placeholder, ex. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "Filtro de Lista de Usuário" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Define filtro a aplicar ao obter usuários." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Filtro de Grupo" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define o filtro a aplicar ao obter grupos." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\"" -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Configurações de conexão" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" -msgstr "" +msgstr "Configuração ativa" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Quando assinalada, esta configuração será pulada." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Porta" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" -msgstr "" +msgstr "Desativar Servidor Principal" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Quando ativado, ownCloud somente conectar-se-á ao servidor réplica." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Não use adicionalmente para conexões LDAPS, pois falhará." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor LDAP sensível à caixa alta (Windows)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Desligar validação de certificado SSL." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Não recomendado, use somente para testes." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "em segundos. Uma mudança esvaziará o cache." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" -msgstr "" +msgstr "Configurações de Diretório" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Campo Nome de Exibição de Usuário" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário." -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Árvore de Usuário Base" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" -msgstr "" +msgstr "Um usuário-base DN por linha" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" -msgstr "" +msgstr "Atributos de busca de usuário" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Opcional; um atributo por linha" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Campo Nome de Exibição de Grupo" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo." -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Árvore de Grupo Base" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" -msgstr "" +msgstr "Um grupo-base DN por linha" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" -msgstr "" +msgstr "Atributos de busca de grupo" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Associação Grupo-Membro" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" -msgstr "" +msgstr "Atributos Especiais" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "em bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Ajuda" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 5686b6c7660..1ca4ef84824 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 20:30+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 06:50+0000\n" +"Last-Translator: Langaru \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" @@ -145,7 +145,7 @@ msgstr "отмена" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Невозможно удалить пользователя" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -162,19 +162,19 @@ msgstr "Удалить" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "добавить группу" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Предоставте подходящее имя пользователя" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Ошибка создания пользователя" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Предоставте подходящий пароль" #: personal.php:29 personal.php:30 msgid "__language_name__" @@ -195,7 +195,7 @@ msgstr "Ваши каталоги данных и файлы, вероятно, #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Предупреждение установки" #: templates/admin.php:32 msgid "" @@ -210,17 +210,17 @@ msgstr "Пожалуйста, дважды просмотрите #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Модуль 'fileinfo' потерян" #: 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 "" +msgstr "PHP модуль 'fileinfo' потерян. Мы настоятельно рекомендуем включить этот модуль для получения лучших результатов в mime-типе обнаружения." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Локализация не работает" #: templates/admin.php:61 msgid "" @@ -228,11 +228,11 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "" +msgstr "Этот сервер ownCloud не может поставить локализацию \"en_US.UTF-8\"/\"en_US.UTF8\". Это значит, что могут быть проблемы с опредилёнными символами в именах фалов. Мы настоятельно рекомендуем установить необходимые пакеты на Вашу систему для поддержки en_US.UTF-8/en_US.UTF8." #: templates/admin.php:72 msgid "Internet connection not working" -msgstr "" +msgstr "Интернет соединение не работает" #: templates/admin.php:75 msgid "" @@ -242,90 +242,90 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Этот сервер ownCloud не имеет ни одного рабочего интернет соединения. Это значит, что некоторые возможности, такие как монтаж внешних носителей, уведомления о обновлениях или установки 3го рода приложений,не работают." #: templates/admin.php:89 msgid "Cron" -msgstr "" +msgstr "Демон" #: templates/admin.php:98 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Выполнять одно задание с каждой загруженной страницей" #: templates/admin.php:108 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php зарегистрирован на webcron сервисе. Вызов страницы cron.php в корне owncloud раз в минуту через http." #: templates/admin.php:118 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Использование системной службы cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту." #: templates/admin.php:125 msgid "Sharing" -msgstr "" +msgstr "Общий доступ" #: templates/admin.php:131 msgid "Enable Share API" -msgstr "" +msgstr "Включить API общего доступа" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Позволить программам использовать API общего доступа" #: templates/admin.php:139 msgid "Allow links" -msgstr "" +msgstr "Разрешить ссылки" #: templates/admin.php:140 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой" #: templates/admin.php:147 msgid "Allow resharing" -msgstr "" +msgstr "Разрешить переоткрытие общего доступа" #: templates/admin.php:148 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ" #: templates/admin.php:155 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Разрешить пользователя делать общий доступ любому" #: templates/admin.php:158 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп" #: templates/admin.php:165 msgid "Security" -msgstr "" +msgstr "Безопасность" #: templates/admin.php:178 msgid "Enforce HTTPS" -msgstr "" +msgstr "Принудить к HTTPS" #: templates/admin.php:179 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Принудить клиентов подключаться к ownCloud через шифрованное подключение." #: templates/admin.php:182 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Пожалуйста, подключитесь к этому экземпляру ownCloud через HTTPS для включения или отключения SSL принуждения." #: templates/admin.php:192 msgid "Log" -msgstr "" +msgstr "Лог" #: templates/admin.php:193 msgid "Log level" -msgstr "" +msgstr "Уровень лога" #: templates/admin.php:220 msgid "More" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 50af374e0d3..36be3c3706c 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 68faae5f7a2..fb8cc4e0c80 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 0e87a9cadfe..5e60e27efac 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 1c08282555c..c9bc38f0ef7 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,13 +41,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:418 +#: lib/config.php:398 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:421 +#: lib/config.php:401 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting " "of FTP shares is not possible. Please ask your system administrator to " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 035f07db378..1271253d44c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 9ae14c07fbf..4d7440e632a 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 956fa27aa6a..97806d46465 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index b7a4e24525b..2232f919287 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index f2ed4a30fd5..d37161b4dff 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index defbacb6a4d..93d7d9f6b6f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index cd7a57253ef..3e170c6c326 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 85393a3132c..6b2bbe2b27b 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -8,13 +8,14 @@ # , 2012. # ismail yenigul , 2013. # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:20+0000\n" +"Last-Translator: atakan96 \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" @@ -57,7 +58,7 @@ msgstr "Eklenecek kategori yok?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Bu kategori zaten mevcut: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -258,7 +259,7 @@ msgstr "İhtiyaç duyulan {file} dosyası kurulu değil." #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "" +msgstr "Paylaşılan" #: js/share.js:93 msgid "Share" @@ -385,11 +386,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin ownCloud community." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor." #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -492,14 +493,14 @@ msgstr "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırla msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık." #: templates/installation.php:32 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen bu linki ziyaret edin documentation." #: templates/installation.php:36 msgid "Create an admin account" @@ -582,7 +583,7 @@ msgstr "Giriş yap" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Alternatif Girişler" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index 9656ce67204..3d25044bb6a 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -9,13 +9,14 @@ # , 2012. # ismail yenigul , 2013. # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 19:30+0000\n" +"Last-Translator: atakan96 \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" @@ -74,7 +75,7 @@ msgstr "Diske yazılamadı" #: ajax/upload.php:52 msgid "Not enough storage available" -msgstr "" +msgstr "Yeterli disk alanı yok" #: ajax/upload.php:83 msgid "Invalid directory." @@ -86,7 +87,7 @@ msgstr "Dosyalar" #: js/fileactions.js:125 msgid "Delete permanently" -msgstr "" +msgstr "Kalıcı olarak sil" #: js/fileactions.js:127 templates/index.php:91 templates/index.php:92 msgid "Delete" @@ -131,7 +132,7 @@ msgstr "{new_name} ismi {old_name} ile değiştirildi" #: js/filelist.js:322 msgid "perform delete operation" -msgstr "" +msgstr "Silme işlemini gerçekleştir" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -149,11 +150,11 @@ msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakter #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" -msgstr "" +msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek." #: js/files.js:82 msgid "Your storage is almost full ({usedSpacePercent}%)" -msgstr "" +msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)" #: js/files.js:224 msgid "" @@ -280,7 +281,7 @@ msgstr "Bağlantıdan" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Dosyalar silindi" #: templates/index.php:46 msgid "Cancel upload" @@ -318,4 +319,4 @@ msgstr "Güncel tarama" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "" +msgstr "Sistem dosyası önbelleği güncelleniyor" diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po index fec3cbfb0bc..52609fb3a4e 100644 --- a/l10n/tr/files_encryption.po +++ b/l10n/tr/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:10+0000\n" +"Last-Translator: atakan96 \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" @@ -24,15 +25,15 @@ msgstr "Şifreleme" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "Dosya şifreleme aktif." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "Belirtilen dosya tipleri şifrelenmeyecek:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "Seçilen dosya tiplerini şifreleme:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index bb6c928a053..7e6073c6370 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -4,13 +4,14 @@ # # Translators: # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-28 00:20+0100\n" -"PO-Revision-Date: 2012-12-27 13:50+0000\n" -"Last-Translator: Necdet Yücel \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:20+0000\n" +"Last-Translator: atakan96 \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "" +msgstr "Giriş kabul edildi" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" @@ -28,27 +29,27 @@ msgstr "" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "" +msgstr "Erişim sağlandı" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "" +msgstr "Doldurulması zorunlu alanları doldur" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Lütfen Dropbox app key ve secret temin ediniz" #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:434 +#: lib/config.php:398 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:435 +#: lib/config.php:401 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " @@ -106,16 +107,16 @@ msgstr "Sil" #: templates/settings.php:124 msgid "Enable User External Storage" -msgstr "" +msgstr "Kullanıcılar için Harici Depolamayı Etkinleştir" #: templates/settings.php:125 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver" #: templates/settings.php:136 msgid "SSL root certificates" msgstr "SSL kök sertifikaları" -#: templates/settings.php:153 +#: templates/settings.php:154 msgid "Import Root Certificate" msgstr "Kök Sertifikalarını İçe Aktar" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index bce1ba1a18c..22a2d9527f2 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:10+0000\n" +"Last-Translator: atakan96 \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,20 +21,20 @@ msgstr "" #: ajax/delete.php:22 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "%s Kalıcı olarak silinemedi" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "%s Geri yüklenemedi" #: js/trash.js:7 js/trash.js:94 msgid "perform restore operation" -msgstr "" +msgstr "Geri yükleme işlemini gerçekleştir" #: js/trash.js:33 msgid "delete file permanently" -msgstr "" +msgstr "Dosyayı kalıcı olarak sil" #: js/trash.js:125 templates/index.php:17 msgid "Name" @@ -41,7 +42,7 @@ msgstr "İsim" #: js/trash.js:126 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "Silindi" #: js/trash.js:135 msgid "1 folder" @@ -61,8 +62,8 @@ msgstr "{count} dosya" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Burası boş. Çöp kutun tamamen boş." #: templates/index.php:20 templates/index.php:22 msgid "Restore" -msgstr "" +msgstr "Geri yükle" diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po index 73c00cd9cf1..1e213a1436d 100644 --- a/l10n/tr/files_versions.po +++ b/l10n/tr/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:00+0000\n" +"Last-Translator: atakan96 \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" @@ -21,33 +22,33 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Geri alınamıyor: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "Başarılı." #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "Dosya %s, %s versiyonuna döndürüldü" #: history.php:49 msgid "failure" -msgstr "" +msgstr "hata" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "Dosya %s, %s versiyonuna döndürülemedi." #: history.php:68 msgid "No old versions available" -msgstr "" +msgstr "Eski versiyonlar mevcut değil." #: history.php:73 msgid "No path specified" -msgstr "" +msgstr "Yama belirtilmemiş" #: js/versions.js:16 msgid "History" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 6fc21c7bed5..3409c93a049 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-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 19: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" @@ -149,23 +149,23 @@ msgstr "Yönetici Grubu " msgid "Delete" msgstr "Sil" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__dil_adı__" @@ -389,7 +389,7 @@ msgstr "" #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 8cdf1507e90..62e1e9d8dd4 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -4,13 +4,14 @@ # # Translators: # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:00+0000\n" +"Last-Translator: atakan96 \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" @@ -22,17 +23,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "" -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -48,7 +49,7 @@ msgstr "" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Ayarları kalsınmı?" #: js/settings.js:97 msgid "Cannot add server configuration" @@ -56,11 +57,11 @@ msgstr "" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Bağlantı testi başarılı oldu" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Bağlantı testi başarısız oldu" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" @@ -68,7 +69,7 @@ msgstr "" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Silmeyi onayla" #: templates/settings.php:8 msgid "" @@ -87,224 +88,224 @@ msgstr "" msgid "Server configuration" msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" -msgstr "Konak" +msgstr "Sunucu" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" -msgstr "Base DN" +msgstr "Ana DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" -msgstr "User DN" +msgstr "Kullanıcı DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Parola" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" -msgstr "Kullanıcı Oturum Açma Süzgeci" +msgstr "Kullanıcı Oturum Filtresi" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" -msgstr "Kullanıcı Liste Süzgeci" +msgstr "Kullanıcı Liste Filtresi" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\"" -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Grup Süzgeci" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Bağlantı ayarları" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Port" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" -msgstr "" +msgstr "Ana sunucuyu devredışı birak" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "TLS kullan" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "SSL sertifika doğrulamasını kapat." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Önerilmez, sadece test için kullanın." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Temel Kullanıcı Ağacı" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Temel Grup Ağacı" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Grup-Üye işbirliği" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" msgstr "" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "byte cinsinden" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). " -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Yardım" diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po index 912a2ff24d2..f5f060e198c 100644 --- a/l10n/tr/user_webdavauth.po +++ b/l10n/tr/user_webdavauth.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # Necdet Yücel , 2012. +# TayançKILIÇLI , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 20:10+0000\n" +"Last-Translator: atakan96 \n" "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" @@ -21,13 +22,13 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "WebDAV Kimlik doğrulaması" #: templates/settings.php:4 msgid "URL: http://" msgstr "URL: http://" -#: templates/settings.php:6 +#: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 3c922b2b2b5..80023f786d8 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/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-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 09:40+0000\n" +"Last-Translator: volodya327 \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" @@ -58,7 +58,7 @@ 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 @@ -493,14 +493,14 @@ msgstr "Без безпечного генератора випадкових ч msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що .htaccess файл не працює." #: templates/installation.php:32 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Для отримання інформації, як правильно налаштувати сервер, зверніться до документації." #: templates/installation.php:36 msgid "Create an admin account" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 6eeb4c0aa47..73d909acdc3 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/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-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 10:12+0000\n" +"Last-Translator: volodya327 \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" @@ -24,16 +24,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "Не вдалося перемістити %s - Файл з таким ім'ям вже існує" #: ajax/move.php:27 ajax/move.php:30 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "Не вдалося перемістити %s" #: ajax/rename.php:22 ajax/rename.php:25 msgid "Unable to rename file" -msgstr "" +msgstr "Не вдалося перейменувати файл" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" @@ -72,7 +72,7 @@ msgstr "Невдалося записати на диск" #: ajax/upload.php:52 msgid "Not enough storage available" -msgstr "" +msgstr "Місця більше немає" #: ajax/upload.php:83 msgid "Invalid directory." @@ -278,7 +278,7 @@ msgstr "З посилання" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Видалено файлів" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po index 1ee56609800..f0341a7e32c 100644 --- a/l10n/uk/files_encryption.po +++ b/l10n/uk/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 16:40+0000\n" +"Last-Translator: volodya327 \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" @@ -24,15 +25,15 @@ msgstr "Шифрування" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "Увімкнуто шифрування файлів." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "Такі типи файлів шифруватись не будуть:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "Виключити наступні типи файлів з ​​шифрування:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 6380af6fb3d..68427402a33 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/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-02-11 15:39+0100\n" -"PO-Revision-Date: 2013-02-11 14:40+0000\n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 13:40+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" @@ -21,27 +21,27 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "Допомога" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "Особисте" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "Налаштування" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "Користувачі" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "Додатки" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "Адмін" @@ -53,15 +53,15 @@ msgstr "ZIP завантаження вимкнено." msgid "Files need to be downloaded one by one." msgstr "Файли повинні бути завантаженні послідовно." -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "Повернутися до файлів" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "Вибрані фали завеликі для генерування zip файлу." -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "не може бути визначено" @@ -121,7 +121,7 @@ msgstr "" msgid "%s set the database host." msgstr "" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "You need to enter either an existing account or the administrator." msgstr "" -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" msgstr "" @@ -137,54 +137,54 @@ msgstr "" msgid "MySQL username and/or password not valid" msgstr "" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" msgstr "" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" msgstr "" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." msgstr "" -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" msgstr "" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" msgstr "" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." msgstr "" -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" msgstr "" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний." -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Будь ласка, перевірте інструкції по встановленню." #: template.php:113 msgid "seconds ago" @@ -238,16 +238,16 @@ msgstr "минулого року" msgid "years ago" msgstr "роки тому" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s доступно. Отримати детальну інформацію" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "оновлено" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "перевірка оновлень відключена" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 8023ecb8b18..41e1a49cd7a 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/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-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 16:00+0000\n" +"Last-Translator: volodya327 \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" @@ -134,7 +134,7 @@ msgstr "відмінити" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Неможливо видалити користувача" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -149,23 +149,23 @@ msgstr "Адміністратор групи" msgid "Delete" msgstr "Видалити" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" -msgstr "" +msgstr "додати групу" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Потрібно задати вірне ім'я користувача" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Помилка при створенні користувача" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Потрібно задати вірний пароль" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__language_name__" @@ -184,32 +184,32 @@ 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 "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний." #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Будь ласка, перевірте інструкції по встановленню." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Модуль 'fileinfo' відсутній" #: 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 "" +msgstr "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Локалізація не працює" #: templates/admin.php:61 msgid "" @@ -217,11 +217,11 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "" +msgstr "Цей сервер ownCloud не може встановити мову системи \"en_US.UTF-8\"/\"en_US.UTF8\". Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки en_US.UTF-8/en_US.UTF8." #: templates/admin.php:72 msgid "Internet connection not working" -msgstr "" +msgstr "Інтернет-з'єднання не працює" #: templates/admin.php:75 msgid "" @@ -231,90 +231,90 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Цей сервер ownCloud не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх накопичувачів, повідомлення про оновлення або встановлення допоміжних програм не працюють. Доступ до файлів ​​віддалено та відправка повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud." #: templates/admin.php:89 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:98 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Виконати одне завдання для кожної завантаженої сторінки " #: templates/admin.php:108 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php зареєстрований в службі webcron. Викликає cron.php сторінку в кореневому каталозі owncloud кожну хвилину по http." #: templates/admin.php:118 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Використовується системний cron сервіс. Виклик cron.php файла з owncloud теки за допомогою системного cronjob раз на хвилину." #: templates/admin.php:125 msgid "Sharing" -msgstr "" +msgstr "Спільний доступ" #: templates/admin.php:131 msgid "Enable Share API" -msgstr "" +msgstr "Увімкнути API спільного доступу" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Дозволити програмам використовувати API спільного доступу" #: templates/admin.php:139 msgid "Allow links" -msgstr "" +msgstr "Дозволити посилання" #: templates/admin.php:140 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань" #: templates/admin.php:147 msgid "Allow resharing" -msgstr "" +msgstr "Дозволити перевідкривати спільний доступ" #: templates/admin.php:148 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу" #: templates/admin.php:155 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Дозволити користувачам відкривати спільний доступ для всіх" #: templates/admin.php:158 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи" #: templates/admin.php:165 msgid "Security" -msgstr "" +msgstr "Безпека" #: templates/admin.php:178 msgid "Enforce HTTPS" -msgstr "" +msgstr "Примусове застосування HTTPS" #: templates/admin.php:179 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Зобов'язати клієнтів під'єднуватись до ownCloud через шифроване з'єднання." #: templates/admin.php:182 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Будь ласка, під'єднайтесь до цього ownCloud за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL." #: templates/admin.php:192 msgid "Log" -msgstr "" +msgstr "Протокол" #: templates/admin.php:193 msgid "Log level" -msgstr "" +msgstr "Рівень протоколювання" #: templates/admin.php:220 msgid "More" @@ -389,11 +389,11 @@ msgstr "Ви використали %s із доступних #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Отримати додатки для синхронізації ваших файлів" #: templates/personal.php:25 msgid "Show First Run Wizard again" -msgstr "" +msgstr "Показувати Майстер Налаштувань знову" #: templates/personal.php:36 templates/users.php:23 templates/users.php:79 msgid "Password" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index 2b1bfc0ad9d..41cc88be8cc 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 10:30+0000\n" +"Last-Translator: volodya327 \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" @@ -24,17 +24,17 @@ msgstr "" msgid "Failed to delete the server configuration" msgstr "Не вдалося видалити конфігурацію сервера" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" msgstr "Конфігурація вірна і зв'язок може бути встановлений ​​!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." msgstr "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." @@ -89,224 +89,224 @@ msgstr "Увага: Потрібний модуль PHP LDAP не вст msgid "Server configuration" msgstr "Налаштування Сервера" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" msgstr "Додати налаштування Сервера" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "Хост" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" msgstr "Базовий DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" msgstr "Один Base DN на одній строчці" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" msgstr "DN Користувача" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "Пароль" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." msgstr "Для анонімного доступу, залиште DN і Пароль порожніми." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "Фільтр Користувачів, що під'єднуються" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" msgstr "Фільтр Списку Користувачів" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." msgstr "Визначає фільтр, який застосовується при отриманні користувачів" -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "Фільтр Груп" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." msgstr "Визначає фільтр, який застосовується при отриманні груп." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"." -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Налаштування З'єднання" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" msgstr "Налаштування Активне" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "Порт" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Сервер для резервних копій" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Порт сервера для резервних копій" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" -msgstr "" +msgstr "Вимкнути Головний Сервер" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Коли увімкнуто, ownCloud буде приєднуватись лише до сервера з резервними копіями." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "Використовуйте TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" msgstr "Нечутливий до регістру LDAP сервер (Windows)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "Вимкнути перевірку SSL сертифіката." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "Не рекомендується, використовуйте лише для тестів." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "в секундах. Зміна очищує кеш." -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" -msgstr "" +msgstr "Налаштування Каталога" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" msgstr "Поле, яке відображає Ім'я Користувача" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud." -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" msgstr "Основне Дерево Користувачів" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" msgstr "Один Користувач Base DN на одній строчці" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" -msgstr "" +msgstr "Пошукові Атрибути Користувача" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Додатково; один атрибут на строчку" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" msgstr "Поле, яке відображає Ім'я Групи" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud." -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" msgstr "Основне Дерево Груп" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" msgstr "Одна Група Base DN на одній строчці" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" -msgstr "" +msgstr "Пошукові Атрибути Групи" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" msgstr "Асоціація Група-Член" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" -msgstr "" +msgstr "Спеціальні Атрибути" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "в байтах" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "Допомога" diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po index eec04d63355..59983e50209 100644 --- a/l10n/uk/user_webdavauth.po +++ b/l10n/uk/user_webdavauth.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # , 2012. +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"PO-Revision-Date: 2013-02-18 16:40+0000\n" +"Last-Translator: volodya327 \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" @@ -21,15 +22,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Аутентифікація WebDAV" #: templates/settings.php:4 msgid "URL: http://" msgstr "URL: http://" -#: templates/settings.php:6 +#: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "ownCloud надішле облікові дані на цей URL. Цей плагін перевірить відповідь і буде інтерпретувати HTTP коди 401 і 403 як повідомлення про недійсні повноваження, а решту відповідей як дійсні облікові дані." diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php index a2391a45b23..cfe90f6bc1b 100644 --- a/lib/l10n/es_AR.php +++ b/lib/l10n/es_AR.php @@ -25,12 +25,15 @@ "%s set the database host." => "%s Especifique la dirección de la Base de Datos", "PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.", "You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador", +"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos", "MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido", "DB Error: \"%s\"" => "Error DB: \"%s\"", +"Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"", "MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existente", "Drop this user from MySQL" => "Borrar este usuario de MySQL", "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente", "Drop this user from MySQL." => "Borrar este usuario de MySQL", +"Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"", "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" => "hace unos segundos", diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 053644ddede..434ddcd9736 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -16,6 +16,8 @@ "Files" => "Файли", "Text" => "Текст", "Images" => "Зображення", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", +"Please double check the installation guides." => "Будь ласка, перевірте інструкції по встановленню.", "seconds ago" => "секунди тому", "1 minute ago" => "1 хвилину тому", "%d minutes ago" => "%d хвилин тому", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 8ceb90dd763..ee235105360 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -22,7 +22,7 @@ "Updating...." => "Update...", "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten", "Error" => "Fehler", -"Updated" => "Geupdated", +"Updated" => "Aktualisiert", "Saving..." => "Speichern...", "deleted" => "gelöscht", "undo" => "rückgängig machen", @@ -45,11 +45,11 @@ "Locale not working" => "Lokalisierung funktioniert nicht", "This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", -"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.", -"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", "Enable Share API" => "Teilen-API aktivieren", "Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen", diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index 1e122bdd45a..cc655c81550 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -45,8 +45,10 @@ "Locale not working" => "\"Locale\" no está funcionando", "This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "El servidor ownCloud no puede establecer el sistema locale a \"en_US.UTF-8\"/\"en_US.UTF8\". Esto significa que debe haber u problema con ciertos caracteres en los nombres de archivo. Le recomendamos instalar en su sitema los paquetes requeridos para soportar en_US.UTF-8/en_US.UTF8.", "Internet connection not working" => "La conexión a Internet no esta funcionando. ", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características de ownCloud.", "Cron" => "Cron", "Execute one task with each page loaded" => "Ejecute una tarea con cada pagina cargada.", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http.", "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.", "Sharing" => "Compartiendo", "Enable Share API" => "Habilitar Share API", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 19d3a243c9d..f6b59c333ec 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -37,6 +37,7 @@ "__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 that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents 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 vous référer au guide d'installation.", "Module 'fileinfo' missing" => "Module 'fileinfo' manquant", @@ -55,6 +56,9 @@ "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 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", "Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients à se connecter à Owncloud via une connexion chiffrée.", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index e597809e98c..d40f976a045 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -26,14 +26,45 @@ "Saving..." => "Сохранение...", "deleted" => "удален", "undo" => "отмена", +"Unable to remove user" => "Невозможно удалить пользователя", "Groups" => "Группы", "Group Admin" => "Группа Администраторы", "Delete" => "Удалить", +"add group" => "добавить группу", +"A valid username must be provided" => "Предоставте подходящее имя пользователя", +"Error creating user" => "Ошибка создания пользователя", +"A valid password must be provided" => "Предоставте подходящий пароль", "__language_name__" => "Русский ", "Security Warning" => "Предупреждение безопасности", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.", +"Setup Warning" => "Предупреждение установки", "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." => "Пожалуйста, дважды просмотрите инструкции по установке.", +"Module 'fileinfo' missing" => "Модуль 'fileinfo' потерян", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' потерян. Мы настоятельно рекомендуем включить этот модуль для получения лучших результатов в mime-типе обнаружения.", +"Locale not working" => "Локализация не работает", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Этот сервер ownCloud не может поставить локализацию \"en_US.UTF-8\"/\"en_US.UTF8\". Это значит, что могут быть проблемы с опредилёнными символами в именах фалов. Мы настоятельно рекомендуем установить необходимые пакеты на Вашу систему для поддержки en_US.UTF-8/en_US.UTF8.", +"Internet connection not working" => "Интернет соединение не работает", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Этот сервер ownCloud не имеет ни одного рабочего интернет соединения. Это значит, что некоторые возможности, такие как монтаж внешних носителей, уведомления о обновлениях или установки 3го рода приложений,не работают.", +"Cron" => "Демон", +"Execute one task with each page loaded" => "Выполнять одно задание с каждой загруженной страницей", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зарегистрирован на webcron сервисе. Вызов страницы cron.php в корне owncloud раз в минуту через http.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Использование системной службы cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту.", +"Sharing" => "Общий доступ", +"Enable Share API" => "Включить API общего доступа", +"Allow apps to use the Share API" => "Позволить программам использовать API общего доступа", +"Allow links" => "Разрешить ссылки", +"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой", +"Allow resharing" => "Разрешить переоткрытие общего доступа", +"Allow users to share items shared with them again" => "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ", +"Allow users to share with anyone" => "Разрешить пользователя делать общий доступ любому", +"Allow users to only share with users in their groups" => "Разрешить пользователям делать общий доступ только для пользователей их групп", +"Security" => "Безопасность", +"Enforce HTTPS" => "Принудить к HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Принудить клиентов подключаться к ownCloud через шифрованное подключение.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к этому экземпляру ownCloud через HTTPS для включения или отключения SSL принуждения.", +"Log" => "Лог", +"Log level" => "Уровень лога", "More" => "Больше", "Version" => "Версия", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL.", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 64fae2f04a8..38a1d5f7f52 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -37,6 +37,7 @@ "Forum" => "Forum", "Bugtracker" => "Hata Takip Sistemi", "Commercial Support" => "Ticari Destek", +"Get the apps to sync your files" => "Dosyalarınızı senkronize etmek için uygulamayı indirin", "Password" => "Parola", "Your password was changed" => "Şifreniz değiştirildi", "Unable to change your password" => "Parolanız değiştirilemiyor", diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index fb1557577cb..b30450e2428 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -26,12 +26,45 @@ "Saving..." => "Зберігаю...", "deleted" => "видалені", "undo" => "відмінити", +"Unable to remove user" => "Неможливо видалити користувача", "Groups" => "Групи", "Group Admin" => "Адміністратор групи", "Delete" => "Видалити", +"add group" => "додати групу", +"A valid username must be provided" => "Потрібно задати вірне ім'я користувача", +"Error creating user" => "Помилка при створенні користувача", +"A valid password must be provided" => "Потрібно задати вірний пароль", "__language_name__" => "__language_name__", "Security Warning" => "Попередження про небезпеку", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.", +"Setup Warning" => "Попередження при Налаштуванні", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", +"Please double check the installation guides." => "Будь ласка, перевірте інструкції по встановленню.", +"Module 'fileinfo' missing" => "Модуль 'fileinfo' відсутній", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.", +"Locale not working" => "Локалізація не працює", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Цей сервер ownCloud не може встановити мову системи \"en_US.UTF-8\"/\"en_US.UTF8\". Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки en_US.UTF-8/en_US.UTF8.", +"Internet connection not working" => "Інтернет-з'єднання не працює", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Цей сервер ownCloud не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх накопичувачів, повідомлення про оновлення або встановлення допоміжних програм не працюють. Доступ до файлів ​​віддалено та відправка повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.", +"Cron" => "Cron", +"Execute one task with each page loaded" => "Виконати одне завдання для кожної завантаженої сторінки ", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зареєстрований в службі webcron. Викликає cron.php сторінку в кореневому каталозі owncloud кожну хвилину по http.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Використовується системний cron сервіс. Виклик cron.php файла з owncloud теки за допомогою системного cronjob раз на хвилину.", +"Sharing" => "Спільний доступ", +"Enable Share API" => "Увімкнути API спільного доступу", +"Allow apps to use the Share API" => "Дозволити програмам використовувати API спільного доступу", +"Allow links" => "Дозволити посилання", +"Allow users to share items to the public with links" => "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань", +"Allow resharing" => "Дозволити перевідкривати спільний доступ", +"Allow users to share items shared with them again" => "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу", +"Allow users to share with anyone" => "Дозволити користувачам відкривати спільний доступ для всіх", +"Allow users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи", +"Security" => "Безпека", +"Enforce HTTPS" => "Примусове застосування HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Зобов'язати клієнтів під'єднуватись до ownCloud через шифроване з'єднання.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Будь ласка, під'єднайтесь до цього ownCloud за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.", +"Log" => "Протокол", +"Log level" => "Рівень протоколювання", "More" => "Більше", "Version" => "Версія", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Розроблено ownCloud громадою, вихідний код має ліцензію AGPL.", @@ -48,6 +81,8 @@ "Bugtracker" => "БагТрекер", "Commercial Support" => "Комерційна підтримка", "You have used %s of the available %s" => "Ви використали %s із доступних %s", +"Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів", +"Show First Run Wizard again" => "Показувати Майстер Налаштувань знову", "Password" => "Пароль", "Your password was changed" => "Ваш пароль змінено", "Unable to change your password" => "Не вдалося змінити Ваш пароль", -- GitLab From 0e9b9f4f5ffb180a872ab06f9d124704372282a3 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 19 Feb 2013 00:48:38 +0100 Subject: [PATCH 082/353] no pretty print --- apps/files_external/lib/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 3f08610b2b8..d31c2f35a68 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -312,7 +312,7 @@ class OC_Mount_Config { } else { $file = OC::$SERVERROOT.'/config/mount.json'; } - $content = json_encode($data, JSON_PRETTY_PRINT); + $content = json_encode($data); @file_put_contents($file, $content); } -- GitLab From 9a93db96421b712d8b8485478db4b84594571c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 10:23:34 +0100 Subject: [PATCH 083/353] remove obsolete variables --- apps/files_trashbin/templates/part.list.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index fe8a71f44e6..2de0d7ee91a 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -1,12 +1,8 @@ 200) $relative_date_color = 200; $name = str_replace('+', '%20', urlencode($file['name'])); $name = str_replace('%2F', '/', $name); -- GitLab From 51cef9d8f06586a4e7d4353cb5d7cc3fcddcf97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 10:24:21 +0100 Subject: [PATCH 084/353] allow user to delete selected files from the trash bin permanently --- apps/files_trashbin/ajax/delete.php | 52 ++++++++++++++++++------- apps/files_trashbin/js/trash.js | 30 ++++++++++++-- apps/files_trashbin/templates/index.php | 7 ++++ 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7a6bd1342ea..d922fafeb26 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -3,22 +3,46 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$file = $_REQUEST['file']; +$files = $_REQUEST['files']; +$dirlisting = $_REQUEST['dirlisting']; +$list = explode(';', $files); -$path_parts = pathinfo($file); -if ($path_parts['dirname'] == '.') { - $delimiter = strrpos($file, '.d'); - $filename = substr($file, 0, $delimiter); - $timestamp = substr($file, $delimiter+2); -} else { - $filename = $file; - $timestamp = null; +if (!is_array($list)){ + $list = array($list); } -if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { - OCP\JSON::success(array("data" => array("filename" => $file))); -} else { - $l = OC_L10N::get('files_trashbin'); - OCP\JSON::error(array("data" => array("message" => $l->t("Couldn't delete %s permanently", array($file))))); +$error = array(); +$success = array(); + +$i = 0; +foreach ($list as $file) { + if ( $dirlisting=='0') { + $delimiter = strrpos($file, '.d'); + $filename = substr($file, 0, $delimiter); + $timestamp = substr($file, $delimiter+2); + } else { + $filename = $file; + $timestamp = null; + } + + if(OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { + $success[$i]['filename'] = $file; + $success[$i]['timestamp'] = $timestamp; + $i++; + } else { + $error[] = $filename; + } } +if ( $error ) { + $filelist = ''; + foreach ( $error as $e ) { + $filelist .= $e.', '; + } + $l = OC_L10N::get('files_trashbin'); + $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); + OCP\JSON::error(array("data" => array("message" => $message, + "success" => $success, "error" => $error))); +} else { + OCP\JSON::success(array("data" => array("success" => $success))); +} diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 6c810e4c2bd..1f4be9f15ee 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -34,7 +34,7 @@ $(document).ready(function() { deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {file:tr.attr('data-file') }, + {files:tr.attr('data-file') }, function(result){ if ( result.status == 'success' ) { var row = document.getElementById(result.data.filename); @@ -88,7 +88,7 @@ $(document).ready(function() { } } processSelection(); - }); + }); $('.undelete').click('click',function(event) { var spinner = ''; @@ -113,7 +113,31 @@ $(document).ready(function() { } }); }); - + + $('.delete').click('click',function(event) { + console.log("delete selected"); + var spinner = ''; + var files=getSelectedFiles('file'); + var fileslist=files.join(';'); + var dirlisting=getSelectedFiles('dirlisting')[0]; + + for (var i in files) { + var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); + deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner; + } + + $.post(OC.filePath('files_trashbin','ajax','delete.php'), + {files:fileslist, dirlisting:dirlisting}, + function(result){ + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); + row.parentNode.removeChild(row); + } + if (result.status != 'success') { + OC.dialogs.alert(result.data.message, 'Error'); + } + }); + }); }); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index c3e51b4becd..c948c94d552 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -25,6 +25,13 @@ t( 'Deleted' ); ?> + + + t('Delete')?> + <?php echo $l->t('Delete')?>" /> + + -- GitLab From d82c9fd623e132a619b5314f37df1f6446589840 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Tue, 19 Feb 2013 15:12:35 +0530 Subject: [PATCH 085/353] Text stays inside the sharing dropdown --- core/css/share.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/share.css b/core/css/share.css index e806d25982e..aae4294ff29 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -24,6 +24,10 @@ #shareWithList li { padding-top:.1em; } + + #shareWithList li:first-child { + white-space:normal; + } #dropdown label { font-weight:400; -- GitLab From 815e964362192483989113af5c48d947084b5512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 11:49:41 +0100 Subject: [PATCH 086/353] use instead of --- apps/files_trashbin/ajax/undelete.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 6320c1d0827..57f62816749 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -3,8 +3,8 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$files = $_REQUEST['files']; -$dirlisting = $_REQUEST['dirlisting']; +$files = $_POST['files']; +$dirlisting = $_POST['dirlisting']; $list = explode(';', $files); $error = array(); -- GitLab From ac1b2a74ef33609e5ff99f020bf7d65e6bd56725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 11:50:29 +0100 Subject: [PATCH 087/353] add missing paramenter to post request --- apps/files_trashbin/js/trash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 1f4be9f15ee..1dfe09feca0 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -34,7 +34,7 @@ $(document).ready(function() { deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:tr.attr('data-file') }, + {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, function(result){ if ( result.status == 'success' ) { var row = document.getElementById(result.data.filename); -- GitLab From e6c39fc3e7e11b22c20df361fb891523e8c89a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:14:44 +0100 Subject: [PATCH 088/353] change $_REQUEST to $_POST; fix check if file was successfully deleted --- apps/files_trashbin/ajax/delete.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index d922fafeb26..7684d0465e6 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -3,8 +3,8 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$files = $_REQUEST['files']; -$dirlisting = $_REQUEST['dirlisting']; +$files = $_POST['files']; +$dirlisting = $_POST['dirlisting']; $list = explode(';', $files); if (!is_array($list)){ @@ -24,8 +24,9 @@ foreach ($list as $file) { $filename = $file; $timestamp = null; } - - if(OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { + + OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); + if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; @@ -40,7 +41,7 @@ if ( $error ) { $filelist .= $e.', '; } $l = OC_L10N::get('files_trashbin'); - $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); + $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', '))); OCP\JSON::error(array("data" => array("message" => $message, "success" => $success, "error" => $error))); } else { -- GitLab From 7bfbfe6562a7dbcecdc05b60214a0da83760c4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:24:51 +0100 Subject: [PATCH 089/353] initialize $result --- apps/files_trashbin/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 5d6b5d94e5c..d0b3030dbf8 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -16,6 +16,7 @@ OCP\Util::addScript('files', 'filelist'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; +$result = array(); if ($dir) { $dirlisting = true; $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin'); -- GitLab From 211e651d7222085b528cc6e9dc8d060d8ea6a60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:38:00 +0100 Subject: [PATCH 090/353] add timestamp to function call; fix trash.js to handle multiple delete operation at once --- apps/files_trashbin/ajax/delete.php | 2 +- apps/files_trashbin/js/trash.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7684d0465e6..915ad9379f6 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -26,7 +26,7 @@ foreach ($list as $file) { } OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); - if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { + if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 1dfe09feca0..fc38889dc37 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -36,11 +36,11 @@ $(document).ready(function() { $.post(OC.filePath('files_trashbin','ajax','delete.php'), {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, function(result){ - if ( result.status == 'success' ) { - var row = document.getElementById(result.data.filename); + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); - } else { - deleteAction[0].outerHTML = oldHTML; + } + if (result.status != 'success') { OC.dialogs.alert(result.data.message, 'Error'); } }); -- GitLab From 686254ac1170dfd76d90b3cc6bd54761ae3d6908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 18:45:46 +0100 Subject: [PATCH 091/353] move2trash() handles keyfiles --- apps/files_trashbin/lib/trash.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8d54a471b42..1c0306ea90a 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -37,7 +37,9 @@ class Trashbin { $view = new \OC_FilesystemView('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); - $view->mkdir("versions_trashbin"); + $view->mkdir("files_trashbin/files"); + $view->mkdir("files_trashbin/versions"); + $view->mkdir("files_trashbin/keyfiles"); } $path_parts = pathinfo($file_path); @@ -54,31 +56,38 @@ class Trashbin { } if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { - $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); + $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); } - $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); + $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); - if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) { + if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) { $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. - $view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp); + $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp); \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR); return; } - + + // Take core of file versions if ( \OCP\App::isEnabled('files_versions') ) { if ( $view->is_dir('files_versions'.$file_path) ) { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)); - $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp); + $view->rename('files_versions'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp); } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) { foreach ($versions as $v) { $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']); - $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); + $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions'. $deleted.'.v'.$v['version'].'.d'.$timestamp); } } } + + // Take care of encryption keys + if ( \OCP\App::isEnabled('files_encryption') ) { + $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); + $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); + } + } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR); } -- GitLab From 99758dce2b9e014081c27ff35b1df9e16f9eb430 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 20 Feb 2013 00:03:28 +0100 Subject: [PATCH 092/353] [tx-robot] updated from transifex --- apps/files/l10n/nl.php | 1 + apps/files/l10n/pl.php | 2 + apps/files_trashbin/l10n/uk.php | 9 +++- apps/files_versions/l10n/uk.php | 8 ++++ l10n/el/settings.po | 8 ++-- l10n/gl/core.po | 4 +- l10n/gl/files.po | 4 +- l10n/gl/lib.po | 4 +- l10n/nl/files.po | 8 ++-- l10n/pl/files.po | 11 ++--- 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 | 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/tr/settings.po | 68 ++++++++++++++--------------- l10n/uk/files_trashbin.po | 23 +++++----- l10n/uk/files_versions.po | 23 +++++----- l10n/uk/lib.po | 43 +++++++++--------- lib/l10n/uk.php | 18 ++++++++ settings/l10n/el.php | 2 + settings/l10n/tr.php | 32 +++++++++++++- 28 files changed, 182 insertions(+), 110 deletions(-) diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 381325d113c..a92ec933b22 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -60,6 +60,7 @@ "Text file" => "Tekstbestand", "Folder" => "Map", "From link" => "Vanaf link", +"Deleted files" => "Verwijderde bestanden", "Cancel upload" => "Upload afbreken", "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!", "Download" => "Download", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 83091bad18c..d68a871a7d7 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -10,6 +10,7 @@ "No file was uploaded" => "Nie przesłano żadnego pliku", "Missing a temporary folder" => "Brak katalogu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", +"Not enough storage available" => "Za mało miejsca", "Invalid directory." => "Zła ścieżka.", "Files" => "Pliki", "Delete" => "Usuwa element", @@ -54,6 +55,7 @@ "Text file" => "Plik tekstowy", "Folder" => "Katalog", "From link" => "Z linku", +"Deleted files" => "Pliki usnięte", "Cancel upload" => "Przestań wysyłać", "Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!", "Download" => "Pobiera element", diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php index 14c6931255a..06474d9b2cd 100644 --- a/apps/files_trashbin/l10n/uk.php +++ b/apps/files_trashbin/l10n/uk.php @@ -1,7 +1,14 @@ "Неможливо видалити %s назавжди", +"Couldn't restore %s" => "Неможливо відновити %s", +"perform restore operation" => "виконати операцію відновлення", +"delete file permanently" => "видалити файл назавжди", "Name" => "Ім'я", +"Deleted" => "Видалено", "1 folder" => "1 папка", "{count} folders" => "{count} папок", "1 file" => "1 файл", -"{count} files" => "{count} файлів" +"{count} files" => "{count} файлів", +"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!", +"Restore" => "Відновити" ); diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php index 49acda81079..861523bf6a4 100644 --- a/apps/files_versions/l10n/uk.php +++ b/apps/files_versions/l10n/uk.php @@ -1,5 +1,13 @@ "Не вдалося відновити: %s", +"success" => "успішно", +"File %s was reverted to version %s" => "Файл %s був відновлений до версії %s", +"failure" => "неуспішно", +"File %s could not be reverted to version %s" => "Файл %s не може бути відновлений до версії %s", +"No old versions available" => "Старі версії недоступні", +"No path specified" => "Шлях не вказаний", "History" => "Історія", +"Revert a file to a previous version by clicking on its revert button" => "Відновити файл на попередню версію, натиснувши на кнопку Відновити", "Files Versioning" => "Версії файлів", "Enable" => "Включити" ); diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 6c417dcbf34..d86b53331ac 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 12:30+0000\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 22:10+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" @@ -164,7 +164,7 @@ msgstr "προσθήκη ομάδας" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" @@ -172,7 +172,7 @@ msgstr "Σφάλμα δημιουργίας χρήστη" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό" #: personal.php:29 personal.php:30 msgid "__language_name__" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index f67798a78e6..a21a74f87d5 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" -"PO-Revision-Date: 2013-02-15 15:00+0000\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 12:10+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.po b/l10n/gl/files.po index 5fb9fb14dfd..42f77c08b62 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-16 00:04+0100\n" -"PO-Revision-Date: 2013-02-15 14:31+0000\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 12:10+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/lib.po b/l10n/gl/lib.po index aa47bb80329..00e1b816f8f 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/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-02-16 00:04+0100\n" -"PO-Revision-Date: 2013-02-15 15:40+0000\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 12:10+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/nl/files.po b/l10n/nl/files.po index bbd8fd530f3..0cc281e39e4 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 21:50+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" @@ -286,7 +286,7 @@ msgstr "Vanaf link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Verwijderde bestanden" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 9890a2eae89..35556a13c0c 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -7,6 +7,7 @@ # Cyryl Sochacki <>, 2012. # Cyryl Sochacki , 2012-2013. # Marcin Małecki , 2011-2012. +# Mariusz , 2013. # , 2011. # , 2012. # Piotr Sokół , 2012. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 15:50+0000\n" +"Last-Translator: Mariusz Fik \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" @@ -76,7 +77,7 @@ msgstr "Błąd zapisu na dysk" #: ajax/upload.php:52 msgid "Not enough storage available" -msgstr "" +msgstr "Za mało miejsca" #: ajax/upload.php:83 msgid "Invalid directory." @@ -282,7 +283,7 @@ msgstr "Z linku" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Pliki usnięte" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 36be3c3706c..bd782be12d2 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index fb8cc4e0c80..7d45d571c9d 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 5e60e27efac..b27519c01e6 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index c9bc38f0ef7..6e98b59654a 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 1271253d44c..c1f7c6dcd28 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 4d7440e632a..0e34b311a8f 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ajax/delete.php:22 +#: ajax/delete.php:24 #, php-format msgid "Couldn't delete %s permanently" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 97806d46465..0339eb09170 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 2232f919287..53147fb1c57 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index d37161b4dff..6403daf074a 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 93d7d9f6b6f..cbc32af4131 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 3e170c6c326..15865d8de37 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 3409c93a049..65ec66d804e 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Aranel Surion , 2011, 2012. +# Aranel Surion , 2011-2013. # Emre , 2012. # , 2012. # Necdet Yücel , 2012. @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 19:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-18 23:30+0000\n" +"Last-Translator: Aranel Surion \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +32,7 @@ msgstr "Eşleşme hata" #: ajax/changedisplayname.php:32 msgid "Unable to change display name" -msgstr "" +msgstr "Ekran adı değiştirilemiyor" #: ajax/creategroup.php:10 msgid "Group already exists" @@ -72,7 +72,7 @@ msgstr "Geçersiz istek" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Yöneticiler kendilerini yönetici grubundan kaldıramaz" #: ajax/togglegroups.php:28 #, php-format @@ -82,15 +82,15 @@ msgstr "Kullanıcı %s grubuna eklenemiyor" #: ajax/togglegroups.php:34 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "%s grubundan kullanıcı kaldırılamıyor" #: ajax/updateapp.php:14 msgid "Couldn't update app." -msgstr "" +msgstr "Uygulama güncellenemedi." #: js/apps.js:30 msgid "Update to {appversion}" -msgstr "" +msgstr "{appversion} Güncelle" #: js/apps.js:36 js/apps.js:76 msgid "Disable" @@ -102,15 +102,15 @@ msgstr "Etkin" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "Lütfen bekleyin...." #: js/apps.js:84 msgid "Updating...." -msgstr "" +msgstr "Güncelleniyor...." #: js/apps.js:87 msgid "Error while updating app" -msgstr "" +msgstr "Uygulama güncellenirken hata" #: js/apps.js:87 msgid "Error" @@ -118,7 +118,7 @@ msgstr "Hata" #: js/apps.js:90 msgid "Updated" -msgstr "" +msgstr "Güncellendi" #: js/personal.js:96 msgid "Saving..." @@ -134,7 +134,7 @@ msgstr "geri al" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Kullanıcı kaldırılamıyor" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -151,19 +151,19 @@ msgstr "Sil" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "grup ekle" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Kullanıcı oluşturulurken hata" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Geçerli bir parola mutlaka sağlanmalı" #: personal.php:29 personal.php:30 msgid "__language_name__" @@ -184,7 +184,7 @@ msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden e #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Kurulum Uyarısı" #: templates/admin.php:32 msgid "" @@ -199,7 +199,7 @@ msgstr "" #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Modül 'fileinfo' kayıp" #: templates/admin.php:47 msgid "" @@ -352,7 +352,7 @@ msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın " #: templates/apps.php:29 msgid "-licensed by " -msgstr "" +msgstr "-lisanslayan " #: templates/apps.php:31 msgid "Update" @@ -393,7 +393,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin" #: templates/personal.php:25 msgid "Show First Run Wizard again" -msgstr "" +msgstr "İlk Çalıştırma Sihirbazını yeniden göster" #: templates/personal.php:36 templates/users.php:23 templates/users.php:79 msgid "Password" @@ -421,19 +421,19 @@ msgstr "Parola değiştir" #: templates/personal.php:54 templates/users.php:78 msgid "Display Name" -msgstr "" +msgstr "Ekran Adı" #: templates/personal.php:55 msgid "Your display name was changed" -msgstr "" +msgstr "Ekran adınız değiştirildi" #: templates/personal.php:56 msgid "Unable to change your display name" -msgstr "" +msgstr "Ekran adınız değiştirilemiyor" #: templates/personal.php:59 msgid "Change display name" -msgstr "" +msgstr "Ekran adını değiştir" #: templates/personal.php:68 msgid "Email" @@ -461,11 +461,11 @@ msgstr "WebDAV" #: templates/personal.php:89 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın" #: templates/users.php:21 templates/users.php:77 msgid "Login Name" -msgstr "" +msgstr "Giriş Adı" #: templates/users.php:32 msgid "Create" @@ -473,11 +473,11 @@ msgstr "Oluştur" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Varsayılan Depolama" #: templates/users.php:41 templates/users.php:139 msgid "Unlimited" -msgstr "" +msgstr "Limitsiz" #: templates/users.php:59 templates/users.php:154 msgid "Other" @@ -485,16 +485,16 @@ msgstr "Diğer" #: templates/users.php:84 msgid "Storage" -msgstr "" +msgstr "Depolama" #: templates/users.php:95 msgid "change display name" -msgstr "" +msgstr "ekran adını değiştir" #: templates/users.php:99 msgid "set new password" -msgstr "" +msgstr "yeni parola belirle" #: templates/users.php:134 msgid "Default" -msgstr "" +msgstr "Varsayılan" diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po index d2cbb893abc..7f2bd9d813e 100644 --- a/l10n/uk/files_trashbin.po +++ b/l10n/uk/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 14:20+0000\n" +"Last-Translator: volodya327 \n" "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" @@ -17,23 +18,23 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:24 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Неможливо видалити %s назавжди" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Неможливо відновити %s" #: js/trash.js:7 js/trash.js:94 msgid "perform restore operation" -msgstr "" +msgstr "виконати операцію відновлення" #: js/trash.js:33 msgid "delete file permanently" -msgstr "" +msgstr "видалити файл назавжди" #: js/trash.js:125 templates/index.php:17 msgid "Name" @@ -41,7 +42,7 @@ msgstr "Ім'я" #: js/trash.js:126 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "Видалено" #: js/trash.js:135 msgid "1 folder" @@ -61,8 +62,8 @@ msgstr "{count} файлів" #: 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" -msgstr "" +msgstr "Відновити" diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po index a511f9ae557..91c980409da 100644 --- a/l10n/uk/files_versions.po +++ b/l10n/uk/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 14:30+0000\n" +"Last-Translator: volodya327 \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" @@ -21,33 +22,33 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Не вдалося відновити: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "успішно" #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "Файл %s був відновлений до версії %s" #: history.php:49 msgid "failure" -msgstr "" +msgstr "неуспішно" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "Файл %s не може бути відновлений до версії %s" #: history.php:68 msgid "No old versions available" -msgstr "" +msgstr "Старі версії недоступні" #: history.php:73 msgid "No path specified" -msgstr "" +msgstr "Шлях не вказаний" #: js/versions.js:16 msgid "History" @@ -55,7 +56,7 @@ msgstr "Історія" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "" +msgstr "Відновити файл на попередню версію, натиснувши на кнопку Відновити" #: templates/settings.php:3 msgid "Files Versioning" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 68427402a33..3ed55cb1ef1 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -7,13 +7,14 @@ # , 2012. # , 2012. # , 2013. +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 13:40+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"PO-Revision-Date: 2013-02-19 14:10+0000\n" +"Last-Translator: volodya327 \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" @@ -91,51 +92,51 @@ msgstr "Зображення" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "Встановіть ім'я адміністратора." #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "Встановіть пароль адміністратора." #: setup.php:40 msgid "Specify a data folder." -msgstr "" +msgstr "Вкажіть теку для даних." #: setup.php:53 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s введіть ім'я користувача бази даних." #: setup.php:56 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s введіть назву бази даних." #: setup.php:59 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s не можна використовувати крапки в назві бази даних" #: setup.php:62 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s встановити хост бази даних." #: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні" #: setup.php:127 setup.php:150 setup.php:204 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator." #: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Oracle ім'я користувача та/або пароль не дійсні" #: setup.php:203 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "MySQL ім'я користувача та/або пароль не дійсні" #: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 #: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 @@ -143,37 +144,37 @@ msgstr "" #: setup.php:584 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "Помилка БД: \"%s\"" #: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 #: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 #: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Команда, що викликала проблему: \"%s\"" #: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "Користувач MySQL '%s'@'localhost' вже існує." #: setup.php:274 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Видалити цього користувача з MySQL" #: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "Користувач MySQL '%s'@'%%' вже існує" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Видалити цього користувача з MySQL." #: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s" #: setup.php:649 msgid "" diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 434ddcd9736..415c0a80c27 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -16,6 +16,24 @@ "Files" => "Файли", "Text" => "Текст", "Images" => "Зображення", +"Set an admin username." => "Встановіть ім'я адміністратора.", +"Set an admin password." => "Встановіть пароль адміністратора.", +"Specify a data folder." => "Вкажіть теку для даних.", +"%s enter the database username." => "%s введіть ім'я користувача бази даних.", +"%s enter the database name." => "%s введіть назву бази даних.", +"%s you may not use dots in the database name" => "%s не можна використовувати крапки в назві бази даних", +"%s set the database host." => "%s встановити хост бази даних.", +"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні", +"You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.", +"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні", +"MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні", +"DB Error: \"%s\"" => "Помилка БД: \"%s\"", +"Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "Користувач MySQL '%s'@'localhost' вже існує.", +"Drop this user from MySQL" => "Видалити цього користувача з MySQL", +"MySQL user '%s'@'%%' already exists" => "Користувач MySQL '%s'@'%%' вже існує", +"Drop this user from MySQL." => "Видалити цього користувача з MySQL.", +"Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", "Please double check the installation guides." => "Будь ласка, перевірте інструкції по встановленню.", "seconds ago" => "секунди тому", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 18417935285..56c1837625d 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -29,7 +29,9 @@ "Group Admin" => "Ομάδα Διαχειριστών", "Delete" => "Διαγραφή", "add group" => "προσθήκη ομάδας", +"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη", "Error creating user" => "Σφάλμα δημιουργίας χρήστη", +"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό", "__language_name__" => "__όνομα_γλώσσας__", "Security Warning" => "Προειδοποίηση Ασφαλείας", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 38a1d5f7f52..04db8cfcca5 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -1,6 +1,7 @@ "App Store'dan liste yüklenemiyor", "Authentication error" => "Eşleşme hata", +"Unable to change display name" => "Ekran adı değiştirilemiyor", "Group already exists" => "Grup zaten mevcut", "Unable to add group" => "Gruba eklenemiyor", "Could not enable app. " => "Uygulama devreye alınamadı", @@ -10,19 +11,34 @@ "Unable to delete user" => "Kullanıcı silinemiyor", "Language changed" => "Dil değiştirildi", "Invalid request" => "Geçersiz istek", +"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini yönetici grubundan kaldıramaz", "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor", +"Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor", +"Couldn't update app." => "Uygulama güncellenemedi.", +"Update to {appversion}" => "{appversion} Güncelle", "Disable" => "Etkin değil", "Enable" => "Etkin", +"Please wait...." => "Lütfen bekleyin....", +"Updating...." => "Güncelleniyor....", +"Error while updating app" => "Uygulama güncellenirken hata", "Error" => "Hata", +"Updated" => "Güncellendi", "Saving..." => "Kaydediliyor...", "deleted" => "silindi", "undo" => "geri al", +"Unable to remove user" => "Kullanıcı kaldırılamıyor", "Groups" => "Gruplar", "Group Admin" => "Yönetici Grubu ", "Delete" => "Sil", +"add group" => "grup ekle", +"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı", +"Error creating user" => "Kullanıcı oluşturulurken hata", +"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı", "__language_name__" => "__dil_adı__", "Security Warning" => "Güvenlik Uyarisi", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.", +"Setup Warning" => "Kurulum Uyarısı", +"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp", "More" => "Daha fazla", "Version" => "Sürüm", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Geliştirilen TarafownCloud community, the source code is altında lisanslanmıştır AGPL.", @@ -30,6 +46,7 @@ "More Apps" => "Daha fazla App", "Select an App" => "Bir uygulama seçin", "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ", +"-licensed by " => "-lisanslayan ", "Update" => "Güncelleme", "User Documentation" => "Kullanıcı Belgelendirmesi", "Administrator Documentation" => "Yönetici Belgelendirmesi", @@ -38,18 +55,31 @@ "Bugtracker" => "Hata Takip Sistemi", "Commercial Support" => "Ticari Destek", "Get the apps to sync your files" => "Dosyalarınızı senkronize etmek için uygulamayı indirin", +"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster", "Password" => "Parola", "Your password was changed" => "Şifreniz değiştirildi", "Unable to change your password" => "Parolanız değiştirilemiyor", "Current password" => "Mevcut parola", "New password" => "Yeni parola", "Change password" => "Parola değiştir", +"Display Name" => "Ekran Adı", +"Your display name was changed" => "Ekran adınız değiştirildi", +"Unable to change your display name" => "Ekran adınız değiştirilemiyor", +"Change display name" => "Ekran adını değiştir", "Email" => "Eposta", "Your email address" => "Eposta adresiniz", "Fill in an email address to enable password recovery" => "Parola sıfırlamayı aktifleştirmek için eposta adresi girin", "Language" => "Dil", "Help translate" => "Çevirilere yardım edin", "WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın", +"Login Name" => "Giriş Adı", "Create" => "Oluştur", -"Other" => "Diğer" +"Default Storage" => "Varsayılan Depolama", +"Unlimited" => "Limitsiz", +"Other" => "Diğer", +"Storage" => "Depolama", +"change display name" => "ekran adını değiştir", +"set new password" => "yeni parola belirle", +"Default" => "Varsayılan" ); -- GitLab From 94e5de8fd08c832b713a8162609857b36ed995f7 Mon Sep 17 00:00:00 2001 From: maelzx Date: Wed, 20 Feb 2013 11:14:24 +0800 Subject: [PATCH 093/353] Update apps/files_versions/js/versions.js Fix "All version..." button not clickable. Reason is Google Chrome blocking inline javascript execution. --- apps/files_versions/js/versions.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index b9c54689813..dec222eefce 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -41,6 +41,10 @@ $(document).ready(function(){ } }); +function goToVersionPage(url){ + window.location(url); +} + function createVersionsDropdown(filename, files) { var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename ); @@ -51,7 +55,7 @@ function createVersionsDropdown(filename, files) { html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; if (filename) { @@ -60,6 +64,10 @@ function createVersionsDropdown(filename, files) { } else { $(html).appendTo($('thead .share')); } + + $("#makelink").click(function() { + goToVersionPage(historyUrl); + }); $.ajax({ type: 'GET', -- GitLab From 0efa4182dce6eb7179bea42646d7260bf5c97ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 20 Feb 2013 10:42:54 +0100 Subject: [PATCH 094/353] Update office icons --- core/img/filetypes/application-msexcel.png | Bin 566 -> 663 bytes core/img/filetypes/application-mspowerpoint.png | Bin 519 -> 588 bytes core/img/filetypes/application-msword.png | Bin 789 -> 651 bytes core/img/filetypes/ms-excel.png | Bin 566 -> 663 bytes core/img/filetypes/ms-powerpoint.png | Bin 519 -> 588 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png index abcd93689a08ec9bdbf0984927e8da06c043c7cd..b977d7e52e2446ea01201c5c7209ac3a05f12c9f 100644 GIT binary patch delta 586 zcmV-Q0=50N1eXPnSbqX3NklocDYX+w13v#(9+(pm2Y`rBgB%HhpcqAwHGjs)zZ?XCjE;`p19k(R zh%^AQQ54xysU+ocx$c#f61Z4HnT#3u~FR(3>BnZni zMIF4DouI8HiGLE0r61qOq|?OXaf-zv&N+-Rq*5sW^wy3hj(uOG^bs)oLvem;DeqBPUOyv)#?i1TLZHCN9Kvwz0{ z!ivH7eYDnSt%=2A>wqw@%zT~Z`SdfMzRS^BJ z!=Cg$-p{_`)8~(bp23S8QPm(KD5Y@DHU8z<8`%xd*nMfQgkjj=`WeH(aO(OYtZ954 zXQkn>)qqC0o}%!w}4`Ea$4)7Uae39IBRVMaGM#n)~*6p{Z{8)wK{v7Okjch YFP;~xM=H}_J^%m!07*qoM6N<$f_ye1d;kCd delta 488 zcmVNB_XI7v8TT#7Ow1h@d0(p>E&7-?^Da3<+o?9Yr;hHU^L<$w4{Ujg*A z6d~mYV4na=hT4Nz+_}SGTgW|Iir!%$;@OGkWI6+j0H}~K4RYR%!7y|zM`O@*K>rL{ z*&}x3lR**HrGL3dS>LXps$d!#`oaNnj-xjmOk?1;&##}sm`GeCN0T diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644 GIT binary patch delta 509 zcmVc0NZemuCP!{KnLBw#02DSHvpDe1=-fW?3Ng5AEt$=eUHr|W3$NRou{cuWWZ z5uw>^0$|k%0DtL+XPmfskJ|1YAw9w!9`N)1^Aesr;y5Nr5-ODn)oOL|CGi}f9!&iV zwpK$khld0mrhJP0SsGJ2%QK?#~b*9`#}2tLg_ZGie66CL#xbVLc0R9ACGy zg;F4R?|%VdonY_%5#Y^V>wJE;&UQ@&9vJ)v^(=h-6CamO00000NkvXXu0mjfs-Eoo delta 440 zcmV;p0Z0DK1cwBWS$~;HL_t&-8KuF`i;ZC%#^KNN_Mn)f%tDevel8Uo4J*k?DQ0aJ z^A9LnrL3%3C~WN5$YQc$H%pW$gGLQyL1JpkIcMJYd*7ZXj%HzMG}o1Evk{qM>h`NE zz+T`Ka2#w*LZ)dFO#(?MSlX1maAeQ+6Ubb>cr;;~%eP+M^?!f5`RI)cGQXXsxIg=y z5wo`GiE-Y3S{hPhDtQ-w9NM{sDkc8u-IpO%f6#8G$P~7>QW$vub;x=+B2i=t%b8+& zVx09-h$>T9P85^ZpD~b-VdlnJ&fhynuh&Bol8{71@OWwlE2uJsC8}@zmNUn8GxOpz zRj)V3!2|oKY=2{m*K_k!?t-eJuuQc)2wIz;!;UIKBoeE25mZt~l_`=$H5|6|+aLxl zl_YEf1{>Q%7gX+6s4|5yBQ}3^T_6XQZDbP)D!Ze~6zXIkQ9PYpWTZE?jfD>%Y1@{S zwk5itNez`{Q)G&e7J>b9cP_BngG&!ti|rp2nJV;T@-f=;!?sT%?T|XKumYeSaefwW^{L9a%BKPWN%_+AW3au zXJt}lVPtu6$z?nM00JFJL_t(I%Z-z}Ym`wC#eetleaWK1%?39JF2tk}u~TET5D~Pq z5y4U`Q(1_uU@IbslJqwDUxI~_Mv;KvgDjhk*J`>E223Q5>T$=~mtA71q-jdG+eJhOAyBW^0k9Gk1+rX8)zFx((CG^&tDY>6 zXaS~Fy!WJON|Gdujg5^~VztuuYwG*C7#d7W9 zBvaKCiHb1>0OuUm+Jg=h>mU}wnW==^*H59qga&Rb)N$4z!&@=N{JxnHyopq{wsW38 zJ_`ziENbxN!Q7~zy`2+^{icJz19&NfyN}*|40$#_+nAgc0Tn?NR1^_|HTxs{4KuW6 zfJ-5SRlsmGi1+@A9R^APi7^fUIZAVkaTkc@K%5)HINKvSh`{DAZnb%%j-IN{00000 LNkvXXu0mjfaN;Ef delta 764 zcmVV>IRB3Hx05CZ(F*PqRHSv*;z5oCKC3HntbW?9;ba!ELWdKcKV{&h8 zWn^h#AVz6&Wp{6KYjYq?SRgVmFf@mDtj_=d0%S=;|_vLc8iNLz}aL#b^d)TJM%km?_ZAh2T*bt$StQHP+YFf>|7^dcw`frp?Uu!csZ z=BBH=x$e62oq695vx$%pJ@7Ka%=6MO6_IR0Z)`T?Ii0t>;LTE1q4O<77rbU5T2SRey|Sr-7|3_&C!O{lGfzzsdk` zqU{iC*VmzHxOL+yvGUw3n`&26oR1jKm3Tiq#mKj>bPr_7}{^=BEKDzdQeDp0IB(u@uggIDTLY)`NA56UA0bNaQQZsw3$|XJ5`P?qfEG zw-$h>{lfq>HP+!gM7~P!@j>%qz`bYvv^A$NfOSH3q``?2d5FB?suopykXS0!i^nocDYX+w13v#(9+(pm2Y`rBgB%HhpcqAwHGjs)zZ?XCjE;`p19k(R zh%^AQQ54xysU+ocx$c#f61Z4HnT#3u~FR(3>BnZni zMIF4DouI8HiGLE0r61qOq|?OXaf-zv&N+-Rq*5sW^wy3hj(uOG^bs)oLvem;DeqBPUOyv)#?i1TLZHCN9Kvwz0{ z!ivH7eYDnSt%=2A>wqw@%zT~Z`SdfMzRS^BJ z!=Cg$-p{_`)8~(bp23S8QPm(KD5Y@DHU8z<8`%xd*nMfQgkjj=`WeH(aO(OYtZ954 zXQkn>)qqC0o}%!w}4`Ea$4)7Uae39IBRVMaGM#n)~*6p{Z{8)wK{v7Okjch YFP;~xM=H}_J^%m!07*qoM6N<$f_ye1d;kCd delta 488 zcmVNB_XI7v8TT#7Ow1h@d0(p>E&7-?^Da3<+o?9Yr;hHU^L<$w4{Ujg*A z6d~mYV4na=hT4Nz+_}SGTgW|Iir!%$;@OGkWI6+j0H}~K4RYR%!7y|zM`O@*K>rL{ z*&}x3lR**HrGL3dS>LXps$d!#`oaNnj-xjmOk?1;&##}sm`GeCN0T diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644 GIT binary patch delta 509 zcmVc0NZemuCP!{KnLBw#02DSHvpDe1=-fW?3Ng5AEt$=eUHr|W3$NRou{cuWWZ z5uw>^0$|k%0DtL+XPmfskJ|1YAw9w!9`N)1^Aesr;y5Nr5-ODn)oOL|CGi}f9!&iV zwpK$khld0mrhJP0SsGJ2%QK?#~b*9`#}2tLg_ZGie66CL#xbVLc0R9ACGy zg;F4R?|%VdonY_%5#Y^V>wJE;&UQ@&9vJ)v^(=h-6CamO00000NkvXXu0mjfs-Eoo delta 440 zcmV;p0Z0DK1cwBWS$~;HL_t&-8KuF`i;ZC%#^KNN_Mn)f%tDevel8Uo4J*k?DQ0aJ z^A9LnrL3%3C~WN5$YQc$H%pW$gGLQyL1JpkIcMJYd*7ZXj%HzMG}o1Evk{qM>h`NE zz+T`Ka2#w*LZ)dFO#(?MSlX1maAeQ+6Ubb>cr;;~%eP+M^?!f5`RI)cGQXXsxIg=y z5wo`GiE-Y3S{hPhDtQ-w9NM{sDkc8u-IpO%f6#8G$P~7>QW$vub;x=+B2i=t%b8+& zVx09-h$>T9P85^ZpD~b-VdlnJ&fhynuh&Bol8{71@OWwlE2uJsC8}@zmNUn8GxOpz zRj)V3!2|oKY=2{m*K_k!?t-eJuuQc)2wIz;!;UIKBoeE25mZt~l_`=$H5|6|+aLxl zl_YEf1{>Q%7gX+6s4|5yBQ}3^T_6XQZDbP)D!Ze~6zXIkQ9PYpWTZE?jfD>%Y1@{S zwk5itNez`{Q)G&e7J>b9cP_BngG&!ti|rp2nJV;T@-f=;!?sT%?T|XKumY Date: Wed, 20 Feb 2013 12:06:08 +0100 Subject: [PATCH 095/353] attach on() events to external storage table, dom events in the table will always bubble up here --- apps/files_external/js/settings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index be24812869e..ac408786ff6 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -146,7 +146,7 @@ OC.MountConfig={ $(document).ready(function() { $('.chzn-select').chosen(); - $('#selectBackend').on('change', function() { + $('#externalStorage').on('change', '#selectBackend', function() { var tr = $(this).parent().parent(); $('#externalStorage tbody').append($(tr).clone()); $('#externalStorage tbody tr').last().find('.mountPoint input').val(''); @@ -243,11 +243,11 @@ $(document).ready(function() { OC.MountConfig.saveStorage($(this).parent().parent().parent()); }); - $('.applicable').on('change', '.chzn-select', function() { + $('#externalStorage').on('change', '.applicable .chzn-select', function() { OC.MountConfig.saveStorage($(this).parent().parent()); }); - $('td.remove>img').on('click', function() { + $('#externalStorage').on('click', 'td.remove>img', function() { var tr = $(this).parent().parent(); var mountPoint = $(tr).find('.mountPoint input').val(); if ( ! mountPoint) { -- GitLab From 4d0df9614b3aed23920f99645fed7a4385034525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 13:34:32 +0100 Subject: [PATCH 096/353] put all trash bin content in user/files_trashbin --- apps/files_trashbin/lib/trash.php | 64 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 1c0306ea90a..b54805c63e5 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -34,7 +34,7 @@ class Trashbin { */ public static function move2trash($file_path) { $user = \OCP\User::getUser(); - $view = new \OC_FilesystemView('/'. $user); + $view = new \OC\Files\View('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); $view->mkdir("files_trashbin/files"); @@ -87,7 +87,7 @@ class Trashbin { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); } - + } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR); } @@ -127,7 +127,6 @@ class Trashbin { if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } if ( $timestamp ) { $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); @@ -148,12 +147,12 @@ class Trashbin { $path_parts = pathinfo($filename); $result[] = array( 'location' => $path_parts['dirname'], - 'type' => $view->is_dir('/files_trashbin/'.$file) ? 'dir' : 'files', + 'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files', ); $location = ''; } - $source = \OC_Filesystem::normalizePath('files_trashbin/'.$file); + $source = \OC_Filesystem::normalizePath('files_trashbin/files/'.$file); $target = \OC_Filesystem::normalizePath('files/'.$location.'/'.$filename); // we need a extension in case a file/dir with the same name already exists @@ -174,16 +173,16 @@ class Trashbin { $versionedFile = $file; } if ( $result[0]['type'] == 'dir' ) { - $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'versions_trashbin/'. $file)); - $view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'files_trashbin/versions/'. $file)); + $view->rename(\OC_Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { - $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp); + $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } else { - $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v); + $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } } } @@ -216,7 +215,6 @@ class Trashbin { if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } if ( $timestamp ) { @@ -228,28 +226,28 @@ class Trashbin { } if ( \OCP\App::isEnabled('files_versions') ) { - if ($view->is_dir('versions_trashbin/'.$file)) { - $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/versions_trashbin/'.$file)); - $view->unlink('versions_trashbin/'.$file); + if ($view->is_dir('files_trashbin/versions/'.$file)) { + $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/versions/'.$file)); + $view->unlink('files_trashbin/versions/'.$file); } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { - $size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); + $size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); + $view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); } else { - $size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v); - $view->unlink('/versions_trashbin/'.$filename.'.v'.$v); + $size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v); + $view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v); } } } } - if ($view->is_dir('/files_trashbin/'.$file)) { - $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/'.$file)); + if ($view->is_dir('/files_trashbin/files/'.$file)) { + $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/files/'.$file)); } else { - $size += $view->filesize('/files_trashbin/'.$file); + $size += $view->filesize('/files_trashbin/files/'.$file); } - $view->unlink('/files_trashbin/'.$file); + $view->unlink('/files_trashbin/files/'.$file); $trashbinSize -= $size; \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); @@ -272,7 +270,7 @@ class Trashbin { $filename = $filename; } - $target = \OC_Filesystem::normalizePath('files_trashbin/'.$filename); + $target = \OC_Filesystem::normalizePath('files_trashbin/files/'.$filename); return $view->file_exists($target); } @@ -297,19 +295,19 @@ class Trashbin { $timestamp = $r['timestamp']; $filename = $r['id']; if ( $r['timestamp'] < $limit ) { - if ($view->is_dir('files_trashbin/'.$filename.'.d'.$timestamp)) { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/'.$filename.'.d'.$timestamp)); + if ($view->is_dir('files_trashbin/files/'.$filename.'.d'.$timestamp)) { + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/files/'.$filename.'.d'.$timestamp)); } else { - $size += $view->filesize('files_trashbin/'.$filename.'.d'.$timestamp); + $size += $view->filesize('files_trashbin/files/'.$filename.'.d'.$timestamp); } - $view->unlink('files_trashbin/'.$filename.'.d'.$timestamp); + $view->unlink('files_trashbin/files/'.$filename.'.d'.$timestamp); if ($r['type'] == 'dir') { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/versions_trashbin/'.$filename.'.d'.$timestamp)); - $view->unlink('versions_trashbin/'.$filename.'.d'.$timestamp); + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/versions'.$filename.'.d'.$timestamp)); + $view->unlink('files_trashbin/versions'.$filename.'.d'.$timestamp); } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { foreach ($versions as $v) { - $size += $view->filesize('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); + $size += $view->filesize('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); + $view->unlink('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); } } } @@ -373,7 +371,7 @@ class Trashbin { * @param $timestamp timestamp when the file was deleted */ private static function getVersionsFromTrash($filename, $timestamp) { - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/versions_trashbin'); + $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin/versions'); $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename); $versions = array(); if ($timestamp ) { -- GitLab From c49e73d43cd0e775ec653fa59811381b70e3efe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 15:14:32 +0100 Subject: [PATCH 097/353] restore filekeys from trash bin --- apps/files_trashbin/lib/trash.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index b54805c63e5..cde388015e5 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -82,10 +82,11 @@ class Trashbin { } } - // Take care of encryption keys - if ( \OCP\App::isEnabled('files_encryption') ) { - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); - $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); + // Take care of encryption keys + $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key'); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + $trashbinSize += $view->filesize($keyfile); + $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -187,7 +188,18 @@ class Trashbin { } } } - + + // Take care of encryption keys + $keyfile = 'files_trashbin/keyfiles/'.$file; + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + if ( $result[0]['type'] == 'dir' ) { + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $trashbinSize -= $view->filesize($keyfile); + } + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); + } + if ( $timestamp ) { $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); $query->execute(array($user,$filename,$timestamp)); -- GitLab From 3a364639b7649c12dcdd15e1c0344a35432aedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 15:17:32 +0100 Subject: [PATCH 098/353] use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names --- apps/files_trashbin/ajax/delete.php | 6 +----- apps/files_trashbin/ajax/undelete.php | 2 +- apps/files_trashbin/js/trash.js | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 915ad9379f6..80382147eb7 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -5,11 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode(';', $files); - -if (!is_array($list)){ - $list = array($list); -} +$list = explode('|', $files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 57f62816749..b76adb2a2a7 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode(';', $files); +$list = explode('|', $files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index fc38889dc37..c8b862837a6 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -93,7 +93,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join(';'); + var fileslist=files.join('|'); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { @@ -118,7 +118,7 @@ $(document).ready(function() { console.log("delete selected"); var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join(';'); + var fileslist=files.join('|'); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { -- GitLab From 273e1a146b27e197a7450589594edcb9131e3b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 16:33:45 +0100 Subject: [PATCH 099/353] switch to json encoded file list --- apps/files_trashbin/ajax/delete.php | 2 +- apps/files_trashbin/ajax/undelete.php | 2 +- apps/files_trashbin/js/trash.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 80382147eb7..34f35c39ccb 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode('|', $files); +$list = json_decode($files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index b76adb2a2a7..93f2aaf1fa2 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode('|', $files); +$list = json_decode($files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index c8b862837a6..3841a098147 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -6,9 +6,10 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file', filename); var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); + var files = tr.attr('data-file'); undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; $.post(OC.filePath('files_trashbin','ajax','undelete.php'), - {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, + {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, function(result){ for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); @@ -31,10 +32,11 @@ $(document).ready(function() { var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete"); var oldHTML = deleteAction[0].outerHTML; var newHTML = ''; + var files = tr.attr('data-file'); deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, + {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, function(result){ for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); @@ -93,7 +95,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join('|'); + var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { @@ -118,7 +120,7 @@ $(document).ready(function() { console.log("delete selected"); var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join('|'); + var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { -- GitLab From d8e8dab0066439414f282fa15dd1d9d3b851c310 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 20 Feb 2013 21:37:23 +0530 Subject: [PATCH 100/353] Fixes the Email Button and the email input Width. --- core/js/share.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 6d1c3954044..231d07cf3b9 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -186,8 +186,8 @@ OC.Share={ html += ''; html += ''; html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += ''; } html += '
    '; -- GitLab From 326aae8a08248bced07ef59260924a7badda8a4d Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 20 Feb 2013 21:59:12 +0530 Subject: [PATCH 101/353] Hovering on the unshare doesnt spoil look --- core/css/share.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/share.css b/core/css/share.css index aae4294ff29..c0d8e3f9d63 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -29,6 +29,9 @@ white-space:normal; } + #shareWithList .cruds { + margin-left:-10px; + } #dropdown label { font-weight:400; } @@ -47,6 +50,7 @@ float:right; opacity:.5; padding:.3em 0 0 .3em !important; + margin-top:-5px; } #link { -- GitLab From 4b5a662e09e1f1d0b7885b546e7b278fe263be34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 17:58:04 +0100 Subject: [PATCH 102/353] delete keyfiles if file in trash bin gets deleted permanently --- apps/files_trashbin/lib/trash.php | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index cde388015e5..5c0cf36f5b3 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -83,10 +83,14 @@ class Trashbin { } // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key'); - if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { - $trashbinSize += $view->filesize($keyfile); - $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); + $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) { + if ( $view->is_dir('files'.$file_path) ) { + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $trashbinSize += $view->filesize($keyfile.'.key'); + } + $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -190,7 +194,7 @@ class Trashbin { } // Take care of encryption keys - $keyfile = 'files_trashbin/keyfiles/'.$file; + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { if ( $result[0]['type'] == 'dir' ) { $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); @@ -252,6 +256,17 @@ class Trashbin { } } } + } + + // Take care of encryption keys + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + if ( $result[0]['type'] == 'dir' ) { + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $size += $view->filesize($keyfile); + } + $view->unlink($keyfile); } if ($view->is_dir('/files_trashbin/files/'.$file)) { -- GitLab From 5ce6d1fb5774bdc7dacea4c853d5412f03004e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 18:00:15 +0100 Subject: [PATCH 103/353] reuse delete() function in expire() --- apps/files_trashbin/lib/trash.php | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 5c0cf36f5b3..4d230449b59 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -322,27 +322,10 @@ class Trashbin { $timestamp = $r['timestamp']; $filename = $r['id']; if ( $r['timestamp'] < $limit ) { - if ($view->is_dir('files_trashbin/files/'.$filename.'.d'.$timestamp)) { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/files/'.$filename.'.d'.$timestamp)); - } else { - $size += $view->filesize('files_trashbin/files/'.$filename.'.d'.$timestamp); - } - $view->unlink('files_trashbin/files/'.$filename.'.d'.$timestamp); - if ($r['type'] == 'dir') { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/versions'.$filename.'.d'.$timestamp)); - $view->unlink('files_trashbin/versions'.$filename.'.d'.$timestamp); - } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { - foreach ($versions as $v) { - $size += $view->filesize('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); - } - } + $size += self::delete($filename, $timestamp); } } - - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestampexecute(array($user,$limit)); - + $availableSpace = $availableSpace + $size; // if size limit for trash bin reached, delete oldest files in trash bin if ($availableSpace < 0) { @@ -355,8 +338,7 @@ class Trashbin { $availableSpace += $tmp; $size += $tmp; $i++; - } - + } } return $size; -- GitLab From 6ecc3d7ee1a7ae1a33b4906a0ffa1ecc3760c2e1 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 20 Feb 2013 23:08:21 +0530 Subject: [PATCH 104/353] Reduced email input width by 10% to increase space. --- core/js/share.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/share.js b/core/js/share.js index 231d07cf3b9..dc62dd2e04c 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -186,7 +186,7 @@ OC.Share={ html += '
    '; html += ''; html += ''; } -- GitLab From 59fd9b2bd2a23e008a0be3180a423276d7a00f35 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 20 Feb 2013 19:09:58 +0100 Subject: [PATCH 105/353] 5.0.0 beta 1 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index b2a4fce65a2..636f3127f49 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. So the internal version number // of ownCloud 4.5 will be 4.90.0. This is not visible to the user - return array(4, 92, 10); + return array(4, 93, 10); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 alpha 1'; + return '5.0 beta 1'; } /** -- GitLab From 5329c9ea31a1e0c31756d4faf8a9946965032012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 19:18:34 +0100 Subject: [PATCH 106/353] update script which copies all trash bin related files to user/files_trashbin --- apps/files_trashbin/appinfo/update.php | 40 ++++++++++++++++++++++++++ apps/files_trashbin/appinfo/version | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 apps/files_trashbin/appinfo/update.php diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php new file mode 100644 index 00000000000..b0bf79cc510 --- /dev/null +++ b/apps/files_trashbin/appinfo/update.php @@ -0,0 +1,40 @@ + Date: Wed, 20 Feb 2013 21:14:55 +0100 Subject: [PATCH 107/353] Add message when trouble sending email ref #1799 --- core/lostpassword/controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 3ef8eaf71aa..fbcf4a87f22 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller { $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); - OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + try { + OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + } catch (Exception $e) { + OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.'); + } self::displayLostPasswordPage(false, true); } else { self::displayLostPasswordPage(true, false); -- GitLab From 3b9d9eea09bc7ccaad1445882f60ec2478bc34d0 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 20 Feb 2013 21:57:50 +0100 Subject: [PATCH 108/353] replaced for in loops with normal enumerating loops to fix #1803 --- apps/files/js/filelist.js | 4 ++-- apps/files_trashbin/js/trash.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index cc107656da8..0bf1f79ab77 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -315,8 +315,8 @@ var FileList={ do_delete:function(files){ if(files.substr){ files=[files]; - } - for (var i in files) { + } + for (var i=0; i'; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 6c810e4c2bd..23e5fb2fc93 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -88,7 +88,7 @@ $(document).ready(function() { } } processSelection(); - }); + }); $('.undelete').click('click',function(event) { var spinner = ''; @@ -96,7 +96,7 @@ $(document).ready(function() { var fileslist=files.join(';'); var dirlisting=getSelectedFiles('dirlisting')[0]; - for (var i in files) { + for (var i=0; i Date: Wed, 20 Feb 2013 22:17:04 +0100 Subject: [PATCH 109/353] some fixes for the keyfile handling --- apps/files_trashbin/lib/trash.php | 38 +++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 4d230449b59..f11e5c4cbfd 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -69,7 +69,7 @@ class Trashbin { return; } - // Take core of file versions + // Take care of file versions if ( \OCP\App::isEnabled('files_versions') ) { if ( $view->is_dir('files_versions'.$file_path) ) { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)); @@ -86,11 +86,12 @@ class Trashbin { $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path); if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) { if ( $view->is_dir('files'.$file_path) ) { - $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } else { $trashbinSize += $view->filesize($keyfile.'.key'); + $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp); } - $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -149,7 +150,7 @@ class Trashbin { $location = ''; } } else { - $path_parts = pathinfo($filename); + $path_parts = pathinfo($file); $result[] = array( 'location' => $path_parts['dirname'], 'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files', @@ -193,15 +194,24 @@ class Trashbin { } } - // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) + $parts = pathinfo($file); + if ( $result[0]['type'] == 'dir' ) { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename); + } else { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename.'.key'); + } + if ($timestamp) { + $keyfile .= '.d'.$timestamp; + } if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { if ( $result[0]['type'] == 'dir' ) { $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename); } else { $trashbinSize -= $view->filesize($keyfile); + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); } - $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); } if ( $timestamp ) { @@ -258,10 +268,18 @@ class Trashbin { } } - // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + // Take care of encryption keys + $parts = pathinfo($file); + if ( $view->is_dir('/files_trashbin/files/'.$file) ) { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename); + } else { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key'); + } + if ($timestamp) { + $keyfile .= '.d'.$timestamp; + } if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { - if ( $result[0]['type'] == 'dir' ) { + if ( $view->is_dir($keyfile) ) { $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); } else { $size += $view->filesize($keyfile); -- GitLab From 2d6efae25714b188d4e689617b2e4ae8695b0317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 22:19:23 +0100 Subject: [PATCH 110/353] update path to deleted files --- apps/files_trashbin/index.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index a2d4cc0a44d..8f8d143b4d1 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -9,7 +9,7 @@ OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_trashbin', 'index', 'user'); $user = \OCP\User::getUser(); -$view = new OC_Filesystemview('/'.$user.'/files_trashbin'); +$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files'); OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'filelist'); @@ -17,8 +17,7 @@ OCP\Util::addScript('files', 'filelist'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; if ($dir) { - $dirlisting = true; - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin'); + $dirlisting = true; $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); $dirContent = opendir($fullpath); $i = 0; -- GitLab From c1847aaf5159200c38eb52693a2d2a84aef5cb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 22:32:44 +0100 Subject: [PATCH 111/353] change for loop to make it hopefully work with IE --- apps/files_trashbin/js/trash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 3841a098147..94fb4358d37 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -123,7 +123,7 @@ $(document).ready(function() { var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; - for (var i in files) { + for (var i=0; i Date: Wed, 20 Feb 2013 23:11:38 +0100 Subject: [PATCH 112/353] WebDAV-Testing: - write the exception to the log - in case curl is missing we should return true as well --- lib/util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 636f3127f49..5d3286204e4 100755 --- a/lib/util.php +++ b/lib/util.php @@ -562,7 +562,7 @@ class OC_Util { */ public static function isWebDAVWorking() { if (!function_exists('curl_init')) { - return; + return true; } $settings = array( @@ -578,6 +578,7 @@ class OC_Util { } catch(\Sabre_DAV_Exception_NotAuthenticated $e) { $return = true; } catch(\Exception $e) { + OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e, OC_Log::WARN); $return = false; } -- GitLab From fc1fba23040908fe5629f89b66a280aea5578520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 00:02:52 +0100 Subject: [PATCH 113/353] don't show empty trash bin message for sub folders --- apps/files_trashbin/index.php | 1 + apps/files_trashbin/templates/index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 8f8d143b4d1..d575c75f1a3 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -94,6 +94,7 @@ $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('files', $files); +$tmpl->assign('dirlisting', $dirlisting); $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->printPage(); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index c3e51b4becd..b62ca0af00c 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -5,7 +5,7 @@
    - +
    t('Nothing in here. Your trash bin is empty!')?>
    -- GitLab From dcd93a53e4f2d158cb67493ce94ff164bac8f0e8 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 21 Feb 2013 00:15:58 +0100 Subject: [PATCH 114/353] [tx-robot] updated from transifex --- apps/files/l10n/de_DE.php | 4 +- apps/files/l10n/id.php | 4 + apps/files/l10n/pt_BR.php | 1 + apps/files_encryption/l10n/id.php | 7 +- apps/files_external/l10n/id.php | 36 +- apps/files_trashbin/l10n/de.php | 4 +- apps/files_trashbin/l10n/de_DE.php | 4 +- apps/files_trashbin/l10n/id.php | 13 +- apps/files_versions/l10n/id.php | 8 + apps/user_ldap/l10n/de.php | 10 +- apps/user_ldap/l10n/de_DE.php | 4 +- apps/user_ldap/l10n/id.php | 55 +++ apps/user_ldap/l10n/pt_BR.php | 1 + core/l10n/de.php | 18 +- core/l10n/de_DE.php | 6 +- core/l10n/my_MM.php | 3 + l10n/af_ZA/files_trashbin.po | 30 +- l10n/ar/files_trashbin.po | 30 +- l10n/be/files_trashbin.po | 32 +- l10n/bg_BG/files_trashbin.po | 32 +- l10n/bn_BD/files_trashbin.po | 30 +- l10n/ca/files_trashbin.po | 32 +- l10n/cs_CZ/files_trashbin.po | 32 +- l10n/da/files_trashbin.po | 32 +- l10n/de/core.po | 25 +- l10n/de/files.po | 44 +-- l10n/de/files_trashbin.po | 37 +- l10n/de/lib.po | 13 +- l10n/de/settings.po | 16 +- l10n/de/user_ldap.po | 17 +- l10n/de/user_webdavauth.po | 6 +- l10n/de_DE/core.po | 13 +- l10n/de_DE/files.po | 49 +-- l10n/de_DE/files_trashbin.po | 37 +- l10n/de_DE/files_versions.po | 6 +- l10n/de_DE/lib.po | 11 +- l10n/de_DE/settings.po | 14 +- l10n/de_DE/user_ldap.po | 11 +- l10n/de_DE/user_webdavauth.po | 6 +- l10n/el/files_trashbin.po | 32 +- l10n/eo/files_trashbin.po | 30 +- l10n/es/files_trashbin.po | 32 +- l10n/es/settings.po | 19 +- l10n/es_AR/files_trashbin.po | 32 +- l10n/et_EE/files_trashbin.po | 32 +- l10n/eu/files_trashbin.po | 32 +- l10n/fa/files_trashbin.po | 30 +- l10n/fi_FI/files_trashbin.po | 32 +- l10n/fr/files_trashbin.po | 32 +- l10n/gl/files_trashbin.po | 32 +- l10n/he/files_trashbin.po | 30 +- l10n/hi/files_trashbin.po | 30 +- l10n/hr/files_trashbin.po | 30 +- l10n/hu_HU/files_trashbin.po | 32 +- l10n/ia/files_trashbin.po | 30 +- l10n/id/core.po | 6 +- l10n/id/files.po | 50 +-- l10n/id/files_encryption.po | 17 +- l10n/id/files_external.po | 65 +-- l10n/id/files_trashbin.po | 51 ++- l10n/id/files_versions.po | 23 +- l10n/id/lib.po | 60 +-- l10n/id/settings.po | 16 +- l10n/id/user_ldap.po | 227 +++++------ l10n/is/files_trashbin.po | 30 +- l10n/it/files_trashbin.po | 32 +- l10n/ja_JP/files_trashbin.po | 32 +- l10n/ka_GE/files_trashbin.po | 30 +- l10n/ko/files_trashbin.po | 30 +- l10n/ku_IQ/files_trashbin.po | 30 +- l10n/lb/files_trashbin.po | 30 +- l10n/lt_LT/files_trashbin.po | 30 +- l10n/lv/files_trashbin.po | 32 +- l10n/mk/files_trashbin.po | 30 +- l10n/ms_MY/files_trashbin.po | 30 +- l10n/my_MM/core.po | 594 ++++++++++++++++++++++++++++ l10n/my_MM/files.po | 315 +++++++++++++++ l10n/my_MM/files_encryption.po | 38 ++ l10n/my_MM/files_external.po | 120 ++++++ l10n/my_MM/files_sharing.po | 48 +++ l10n/my_MM/files_trashbin.po | 76 ++++ l10n/my_MM/files_versions.po | 65 +++ l10n/my_MM/lib.po | 253 ++++++++++++ l10n/my_MM/settings.po | 496 +++++++++++++++++++++++ l10n/my_MM/user_ldap.po | 309 +++++++++++++++ l10n/my_MM/user_webdavauth.po | 33 ++ l10n/nb_NO/files_trashbin.po | 30 +- l10n/nl/files_trashbin.po | 32 +- l10n/nn_NO/files_trashbin.po | 30 +- l10n/oc/files_trashbin.po | 30 +- l10n/pl/files_trashbin.po | 30 +- l10n/pl_PL/files_trashbin.po | 30 +- l10n/pt_BR/files.po | 47 +-- l10n/pt_BR/files_trashbin.po | 32 +- l10n/pt_BR/user_ldap.po | 6 +- l10n/pt_PT/files_trashbin.po | 32 +- l10n/ro/files_trashbin.po | 30 +- l10n/ru/files_trashbin.po | 32 +- l10n/ru_RU/files_trashbin.po | 32 +- l10n/si_LK/files_trashbin.po | 30 +- l10n/sk/files_trashbin.po | 32 +- l10n/sk_SK/files_trashbin.po | 32 +- l10n/sl/files_trashbin.po | 30 +- l10n/sr/files_trashbin.po | 30 +- l10n/sr@latin/files_trashbin.po | 30 +- l10n/sv/files_trashbin.po | 32 +- l10n/sw_KE/files_trashbin.po | 30 +- l10n/ta_LK/files_trashbin.po | 30 +- l10n/templates/core.pot | 4 +- l10n/templates/files.pot | 40 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 28 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/files_trashbin.po | 30 +- l10n/tr/files_trashbin.po | 32 +- l10n/uk/files_trashbin.po | 32 +- l10n/vi/files_trashbin.po | 32 +- l10n/zh_CN.GB2312/files_trashbin.po | 30 +- l10n/zh_CN/files_trashbin.po | 30 +- l10n/zh_HK/files_trashbin.po | 30 +- l10n/zh_TW/files_trashbin.po | 30 +- lib/l10n/de.php | 6 +- lib/l10n/de_DE.php | 4 +- lib/l10n/my_MM.php | 3 + settings/l10n/de.php | 10 +- settings/l10n/de_DE.php | 8 +- settings/l10n/es.php | 1 + settings/l10n/id.php | 1 + 134 files changed, 4224 insertions(+), 1230 deletions(-) create mode 100644 core/l10n/my_MM.php create mode 100644 l10n/my_MM/core.po create mode 100644 l10n/my_MM/files.po create mode 100644 l10n/my_MM/files_encryption.po create mode 100644 l10n/my_MM/files_external.po create mode 100644 l10n/my_MM/files_sharing.po create mode 100644 l10n/my_MM/files_trashbin.po create mode 100644 l10n/my_MM/files_versions.po create mode 100644 l10n/my_MM/lib.po create mode 100644 l10n/my_MM/settings.po create mode 100644 l10n/my_MM/user_ldap.po create mode 100644 l10n/my_MM/user_webdavauth.po create mode 100644 lib/l10n/my_MM.php diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 8d119afada4..1462efdd5d6 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -24,7 +24,7 @@ "replaced {new_name}" => "{new_name} wurde ersetzt", "undo" => "rückgängig machen", "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", -"perform delete operation" => "Führe das Löschen aus", +"perform delete operation" => "führe das Löschen aus", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", @@ -69,5 +69,5 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache" +"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..." ); diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 4c4e2e0f714..aff1933e569 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -19,6 +19,10 @@ "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", +"1 folder" => "1 map", +"{count} folders" => "{count} map", +"1 file" => "1 berkas", +"{count} files" => "{count} berkas", "Upload" => "Unggah", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran unggah maksimum", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 3a9dafcabf9..eb66e154725 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -60,6 +60,7 @@ "Text file" => "Arquivo texto", "Folder" => "Pasta", "From link" => "Do link", +"Deleted files" => "Arquivos apagados", "Cancel upload" => "Cancelar upload", "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!", "Download" => "Baixar", diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php index 3f9a6c7d07f..6044348e72e 100644 --- a/apps/files_encryption/l10n/id.php +++ b/apps/files_encryption/l10n/id.php @@ -1,4 +1,7 @@ "enkripsi", -"None" => "tidak ada" +"Encryption" => "Enkripsi", +"File encryption is enabled." => "Enkripsi berkas aktif.", +"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:", +"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:", +"None" => "Tidak ada" ); diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php index 4b7850025f4..ab2d2d365f3 100644 --- a/apps/files_external/l10n/id.php +++ b/apps/files_external/l10n/id.php @@ -1,14 +1,26 @@ "akses diberikan", -"Grant access" => "berikan hak akses", -"Fill out all required fields" => "isi semua field yang dibutuhkan", -"External Storage" => "penyimpanan eksternal", -"Configuration" => "konfigurasi", -"Options" => "pilihan", -"Applicable" => "berlaku", -"None set" => "tidak satupun di set", -"All Users" => "semua pengguna", -"Groups" => "grup", -"Users" => "pengguna", -"Delete" => "hapus" +"Access granted" => "Akses diberikan", +"Error configuring Dropbox storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox", +"Grant access" => "Berikan hak akses", +"Fill out all required fields" => "Isi semua field yang dibutuhkan", +"Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.", +"Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Peringatan: \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.", +"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Peringatan: Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.", +"External Storage" => "Penyimpanan Eksternal", +"Mount point" => "Lokasi mount", +"Backend" => "Backend", +"Configuration" => "Konfigurasi", +"Options" => "Pilihan", +"Applicable" => "Berlaku", +"Add mount point" => "Tambah lokasi mount", +"None set" => "Tidak satupun di set", +"All Users" => "Semua Pengguna", +"Groups" => "Grup", +"Users" => "Pengguna", +"Delete" => "Hapus", +"Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna", +"Allow users to mount their own external storage" => "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka", +"SSL root certificates" => "Sertifikat root SSL", +"Import Root Certificate" => "Impor Sertifikat Root" ); diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php index 1271f5c313a..54cd047813c 100644 --- a/apps/files_trashbin/l10n/de.php +++ b/apps/files_trashbin/l10n/de.php @@ -1,8 +1,8 @@ "Konnte %s nicht permanent löschen", +"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", "perform restore operation" => "Wiederherstellung ausführen", -"delete file permanently" => "Datei permanent löschen", +"delete file permanently" => "Datei dauerhaft löschen", "Name" => "Name", "Deleted" => "gelöscht", "1 folder" => "1 Ordner", diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 6d944b3580c..cfa5469820a 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -1,8 +1,8 @@ "Konnte %s nicht entgültig löschen", +"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", "perform restore operation" => "Wiederherstellung ausführen", -"delete file permanently" => "Datei entgültig löschen", +"delete file permanently" => "Datei dauerhaft löschen", "Name" => "Name", "Deleted" => "Gelöscht", "1 folder" => "1 Ordner", diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php index 1a14d8b7c21..9d1ad641599 100644 --- a/apps/files_trashbin/l10n/id.php +++ b/apps/files_trashbin/l10n/id.php @@ -1,3 +1,14 @@ "nama" +"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s", +"Couldn't restore %s" => "Tidak dapat memulihkan %s", +"perform restore operation" => "jalankan operasi pemulihan", +"delete file permanently" => "hapus berkas secara permanen", +"Name" => "Nama", +"Deleted" => "Dihapus", +"1 folder" => "1 map", +"{count} folders" => "{count} map", +"1 file" => "1 berkas", +"{count} files" => "{count} berkas", +"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!", +"Restore" => "Pulihkan" ); diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php index 6c553327c42..6e24a05cbb8 100644 --- a/apps/files_versions/l10n/id.php +++ b/apps/files_versions/l10n/id.php @@ -1,5 +1,13 @@ "Tidak dapat mengembalikan: %s", +"success" => "sukses", +"File %s was reverted to version %s" => "Berkas %s telah dikembalikan ke versi %s", +"failure" => "gagal", +"File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s", +"No old versions available" => "Versi lama tidak tersedia", +"No path specified" => "Lokasi tidak ditentukan", "History" => "riwayat", +"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan", "Files Versioning" => "pembuatan versi file", "Enable" => "aktifkan" ); diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 182025e8fb9..6217a6d4821 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -12,7 +12,7 @@ "Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?", "Confirm Deletion" => "Löschung bestätigen", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", -"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.", "Server configuration" => "Serverkonfiguration", "Add Server Configuration" => "Serverkonfiguration hinzufügen", "Host" => "Host", @@ -38,12 +38,12 @@ "When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert", "Port" => "Port", "Backup (Replica) Host" => "Backup Host (Kopie)", -"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln.", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.", "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", -"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden", +"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.", "Use TLS" => "Nutze TLS", -"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", @@ -55,7 +55,7 @@ "Base User Tree" => "Basis-Benutzerbaum", "One User Base DN per line" => "Ein Benutzer Base DN pro Zeile", "User Search Attributes" => "Benutzersucheigenschaften", -"Optional; one attribute per line" => "Optional, eine Eigenschaft pro Zeile", +"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile", "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ", "Base Group Tree" => "Basis-Gruppenbaum", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 9bee0a219ae..c88ed22b4fa 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -43,7 +43,7 @@ "Disable Main Server" => "Hauptserver deaktivieren", "When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden.", "Use TLS" => "Nutze TLS", -"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen.", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", @@ -55,7 +55,7 @@ "Base User Tree" => "Basis-Benutzerbaum", "One User Base DN per line" => "Ein Benutzer Base DN pro Zeile", "User Search Attributes" => "Benutzer-Suche Eigenschaften", -"Optional; one attribute per line" => "Optional; Ein Attribut pro Zeile", +"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile", "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ", "Base Group Tree" => "Basis-Gruppenbaum", diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php index c07892386d6..5912789c856 100644 --- a/apps/user_ldap/l10n/id.php +++ b/apps/user_ldap/l10n/id.php @@ -1,14 +1,69 @@ "Gagal menghapus konfigurasi server", +"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya.", "Deletion failed" => "penghapusan gagal", +"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?", +"Keep settings?" => "Biarkan pengaturan?", +"Cannot add server configuration" => "Gagal menambah konfigurasi server", +"Connection test succeeded" => "Tes koneksi sukses", +"Connection test failed" => "Tes koneksi gagal", +"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?", +"Confirm Deletion" => "Konfirmasi Penghapusan", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Peringatan: Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.", +"Server configuration" => "Konfigurasi server", +"Add Server Configuration" => "Tambah Konfigurasi Server", "Host" => "host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://", +"Base DN" => "Base DN", +"One Base DN per line" => "Satu Base DN per baris", +"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan", +"User DN" => "User DN", +"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.", "Password" => "kata kunci", +"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.", "User Login Filter" => "gunakan saringan login", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"", +"User List Filter" => "Daftar Filter Pengguna", +"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.", +"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".", "Group Filter" => "saringan grup", +"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".", +"Connection Settings" => "Pengaturan Koneksi", +"Configuration Active" => "Konfigurasi Aktif", +"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.", "Port" => "port", +"Backup (Replica) Host" => "Host Cadangan (Replika)", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.", +"Backup (Replica) Port" => "Port Cadangan (Replika)", +"Disable Main Server" => "Nonaktifkan Server Utama", +"When switched on, ownCloud will only connect to the replica server." => "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika.", "Use TLS" => "gunakan TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.", +"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)", "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda.", "Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.", "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache", +"Directory Settings" => "Pengaturan Direktori", +"User Display Name Field" => "Bidang Tampilan Nama Pengguna", +"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud.", +"Base User Tree" => "Pohon Pengguna Dasar", +"One User Base DN per line" => "Satu Pengguna Base DN per baris", +"User Search Attributes" => "Atribut Pencarian Pengguna", +"Optional; one attribute per line" => "Pilihan; satu atribut per baris", +"Group Display Name Field" => "Bidang Tampilan Nama Grup", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud.", +"Base Group Tree" => "Pohon Grup Dasar", +"One Group Base DN per line" => "Satu Grup Base DN per baris", +"Group Search Attributes" => "Atribut Pencarian Grup", +"Group-Member association" => "asosiasi Anggota-Grup", +"Special Attributes" => "Atribut Khusus", "in bytes" => "dalam bytes", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", "Help" => "bantuan" ); diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index c86263d52a8..e3d2da463cc 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -4,6 +4,7 @@ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.", "The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes.", "Deletion failed" => "Remoção falhou", +"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?", "Keep settings?" => "Manter ajustes?", "Cannot add server configuration" => "Não foi possível adicionar a configuração do servidor", "Connection test succeeded" => "Teste de conexão bem sucedido", diff --git a/core/l10n/de.php b/core/l10n/de.php index f1e892fee47..e60f061ff3c 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,8 +1,8 @@ "Der Nutzer %s hat eine Datei mit dir geteilt", -"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s", +"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt", +"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", @@ -58,10 +58,10 @@ "Error while sharing" => "Fehler beim Teilen", "Error while unsharing" => "Fehler beim Aufheben der Teilung", "Error while changing permissions" => "Fehler beim Ändern der Rechte", -"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt", -"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt", +"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt", +"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt", "Share with" => "Teilen mit", -"Share with link" => "Über einen Link teilen", +"Share with link" => "Über einen Link freigegeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", "Email link to person" => "Link per E-Mail verschicken", @@ -72,7 +72,7 @@ "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Für {user} in {item} freigegeben", -"Unshare" => "Teilung aufheben", +"Unshare" => "Freigabe aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -109,7 +109,7 @@ "Security Warning" => "Sicherheitswarnung", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.", "Create an admin account" => "Administrator-Konto anlegen", "Advanced" => "Fortgeschritten", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 34305258944..9a975ddcb87 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -72,7 +72,7 @@ "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Freigegeben in {item} von {user}", -"Unshare" => "Teilung aufheben", +"Unshare" => "Freigabe aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -84,7 +84,7 @@ "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "Sending ..." => "Sende ...", "Email sent" => "Email gesendet", -"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Gemeinschaft.", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Community.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", @@ -109,7 +109,7 @@ "Security Warning" => "Sicherheitshinweis", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.", "Create an admin account" => "Administrator-Konto anlegen", "Advanced" => "Fortgeschritten", diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php new file mode 100644 index 00000000000..8d5485a4a55 --- /dev/null +++ b/core/l10n/my_MM.php @@ -0,0 +1,3 @@ + "Apps" +); diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po index 6fd4dfb314f..a79bcc39407 100644 --- a/l10n/af_ZA/files_trashbin.po +++ b/l10n/af_ZA/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: af_ZA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po index 174bde4c7f5..74a6b21eb81 100644 --- a/l10n/ar/files_trashbin.po +++ b/l10n/ar/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "اسم" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po index c9d67b5a277..83bee5fbbdd 100644 --- a/l10n/be/files_trashbin.po +++ b/l10n/be/files_trashbin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-01-31 16:03+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +17,7 @@ msgstr "" "Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po index f46acd62e56..7ec18e9da4b 100644 --- a/l10n/bg_BG/files_trashbin.po +++ b/l10n/bg_BG/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 17:50+0000\n" -"Last-Translator: Stefan Ilivanov \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Невъзможно изтриване на %s завинаги" @@ -28,35 +28,39 @@ msgstr "Невъзможно изтриване на %s завинаги" msgid "Couldn't restore %s" msgstr "Невъзможно възтановяване на %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "извършване на действие по възтановяване" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "изтриване на файла завинаги" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Изтрито" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папки" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файла" @@ -67,3 +71,7 @@ msgstr "Няма нищо. Кофата е празна!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Възтановяване" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po index b2577e03d2d..643bed38fcd 100644 --- a/l10n/bn_BD/files_trashbin.po +++ b/l10n/bn_BD/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: bn_BD\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "রাম" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "১টি ফোল্ডার" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} টি ফোল্ডার" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "১টি ফাইল" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} টি ফাইল" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po index 7f76de9cd68..7484f8e5707 100644 --- a/l10n/ca/files_trashbin.po +++ b/l10n/ca/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: rogerc \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No s'ha pogut esborrar permanentment %s" @@ -28,35 +28,39 @@ msgstr "No s'ha pogut esborrar permanentment %s" msgid "Couldn't restore %s" msgstr "No s'ha pogut restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "executa l'operació de restauració" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "esborra el fitxer permanentment" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminat" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 carpeta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} carpetes" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fitxer" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fitxers" @@ -67,3 +71,7 @@ msgstr "La paperera està buida!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recupera" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po index 2052a139930..4241a18db32 100644 --- a/l10n/cs_CZ/files_trashbin.po +++ b/l10n/cs_CZ/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Tomáš Chvátal \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nelze trvale odstranit %s" @@ -28,35 +28,39 @@ msgstr "Nelze trvale odstranit %s" msgid "Couldn't restore %s" msgstr "Nelze obnovit %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "provést obnovu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "trvale odstranit soubor" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Název" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Smazáno" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 složka" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} složky" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 soubor" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} soubory" @@ -67,3 +71,7 @@ msgstr "Žádný obsah. Váš koš je prázdný." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Obnovit" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po index 4e37f67f5b4..6ebb48d5417 100644 --- a/l10n/da/files_trashbin.po +++ b/l10n/da/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Frederik Lassen \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kunne ikke slette %s permanent" @@ -28,35 +28,39 @@ msgstr "Kunne ikke slette %s permanent" msgid "Couldn't restore %s" msgstr "Kunne ikke gendanne %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "udfør gendannelsesoperation" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "slet fil permanent" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Navn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Slettet" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappe" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapper" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -67,3 +71,7 @@ msgstr "Intet at se her. Din papirkurv er tom!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Gendan" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de/core.po b/l10n/de/core.po index bb7deec1e67..f59767d9eb5 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -19,12 +19,13 @@ # Susi <>, 2012. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:10+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -36,26 +37,26 @@ msgstr "" #: ajax/share.php:85 #, php-format msgid "User %s shared a file with you" -msgstr "Der Nutzer %s hat eine Datei mit dir geteilt" +msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt" #: ajax/share.php:87 #, php-format msgid "User %s shared a folder with you" -msgstr "%s hat ein Verzeichnis mit dir geteilt" +msgstr "%s hat ein Verzeichnis mit Dir geteilt" #: ajax/share.php:89 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s" +msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s" #: ajax/share.php:91 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s" +msgstr "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -289,11 +290,11 @@ msgstr "Fehler beim Ändern der Rechte" #: js/share.js:168 msgid "Shared with you and the group {group} by {owner}" -msgstr "{owner} hat dies mit dir und der Gruppe {group} geteilt" +msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt" #: js/share.js:170 msgid "Shared with you by {owner}" -msgstr "{owner} hat dies mit dir geteilt" +msgstr "{owner} hat dies mit Dir geteilt" #: js/share.js:175 msgid "Share with" @@ -301,7 +302,7 @@ msgstr "Teilen mit" #: js/share.js:180 msgid "Share with link" -msgstr "Über einen Link teilen" +msgstr "Über einen Link freigegeben" #: js/share.js:183 msgid "Password protect" @@ -345,7 +346,7 @@ msgstr "Für {user} in {item} freigegeben" #: js/share.js:313 msgid "Unshare" -msgstr "Teilung aufheben" +msgstr "Freigabe aufheben" #: js/share.js:325 msgid "can edit" @@ -402,7 +403,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 21:41+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,8 +111,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Ausstehend" @@ -170,74 +170,74 @@ msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Schließen" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "Eine Datei wird hoch geladen" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "{count} Dateien werden hochgeladen" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten." -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Name" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Größe" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 Datei" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} Dateien" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index 1aa1fd8154b..eb4abe17887 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -5,14 +5,15 @@ # Translators: # I Robot , 2013. # Marcel Kühlhorn , 2013. +# Tristan , 2013. # , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:23+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,45 +21,49 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Konnte %s nicht permanent löschen" +msgstr "Konnte %s nicht dauerhaft löschen" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" msgstr "Konnte %s nicht wiederherstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Wiederherstellung ausführen" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" -msgstr "Datei permanent löschen" +msgstr "Datei dauerhaft löschen" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Name" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "gelöscht" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 Ordner" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} Ordner" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 Datei" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} Dateien" @@ -69,3 +74,7 @@ msgstr "Nichts zu löschen, der Papierkorb ist leer!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Wiederherstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index ba89f5ea5fe..65f4c411198 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -10,13 +10,14 @@ # Phi Lieb <>, 2012. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:10+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." #: helper.php:228 msgid "couldn't be determined" -msgstr "Konnte nicht festgestellt werden" +msgstr "konnte nicht festgestellt werden" #: json.php:28 msgid "Application is not enabled" @@ -102,7 +103,7 @@ msgstr "Setze Administrator Passwort" #: setup.php:40 msgid "Specify a data folder." -msgstr "Datei-Verzeichnis angeben" +msgstr "Datei-Verzeichnis angeben." #: setup.php:53 #, php-format @@ -171,7 +172,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "Lösche diesen Benutzer von MySQL." +msgstr "Lösche diesen Benutzer aus MySQL." #: setup.php:553 setup.php:585 #, php-format diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 736ddb0719b..9d276846203 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -26,9 +26,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:31+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 21:50+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +195,7 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst." +msgstr "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst." #: templates/admin.php:29 msgid "Setup Warning" @@ -246,7 +246,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." +msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest." #: templates/admin.php:89 msgid "Cron" @@ -278,7 +278,7 @@ msgstr "Aktiviere Sharing-API" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "Erlaube Apps die Nutzung der Sharing-API" +msgstr "Erlaube Apps die Nutzung der Share-API" #: templates/admin.php:139 msgid "Allow links" @@ -329,7 +329,7 @@ msgstr "Log" #: templates/admin.php:193 msgid "Log level" -msgstr "Logtiefe" +msgstr "Loglevel" #: templates/admin.php:220 msgid "More" @@ -404,7 +404,7 @@ msgstr "Du verwendest %s der verfügbaren %s" #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter" +msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 431c6be2aee..5bab82f9cbf 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -12,13 +12,14 @@ # Phi Lieb <>, 2012. # Susi <>, 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:20+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkom msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren." +msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren." #: templates/settings.php:15 msgid "Server configuration" @@ -203,7 +204,7 @@ msgstr "Backup Host (Kopie)" msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln." +msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln." #: templates/settings.php:60 msgid "Backup (Replica) Port" @@ -215,7 +216,7 @@ msgstr "Hauptserver deaktivieren" #: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden" +msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden." #: templates/settings.php:62 msgid "Use TLS" @@ -223,7 +224,7 @@ msgstr "Nutze TLS" #: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern." +msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen." #: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" @@ -273,7 +274,7 @@ msgstr "Benutzersucheigenschaften" #: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "Optional, eine Eigenschaft pro Zeile" +msgstr "Optional; eine Eigenschaft pro Zeile" #: templates/settings.php:72 msgid "Group Display Name Field" diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po index 139f573438e..d2653f16859 100644 --- a/l10n/de/user_webdavauth.po +++ b/l10n/de/user_webdavauth.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 13:50+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index b471458f11d..37875797f98 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -22,12 +22,13 @@ # Susi <>, 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" -"PO-Revision-Date: 2013-02-16 23:00+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -348,7 +349,7 @@ msgstr "Freigegeben in {item} von {user}" #: js/share.js:313 msgid "Unshare" -msgstr "Teilung aufheben" +msgstr "Freigabe aufheben" #: js/share.js:325 msgid "can edit" @@ -399,13 +400,13 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Gemeinschaft." +msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Community." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet." -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "ownCloud-Passwort zurücksetzen" @@ -506,7 +507,7 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, d msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert." +msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert." #: templates/installation.php:32 msgid "" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 192ed3dbb85..f6a58a85f8d 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -28,13 +28,14 @@ # , 2012. # Thomas Müller <>, 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 16:30+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -115,8 +116,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Ausstehend" @@ -150,7 +151,7 @@ msgstr "{old_name} wurde ersetzt durch {new_name}" #: js/filelist.js:322 msgid "perform delete operation" -msgstr "Führe das Löschen aus" +msgstr "führe das Löschen aus" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -174,74 +175,74 @@ msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert ode msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Schließen" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "1 Datei wird hochgeladen" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "{count} Dateien wurden hochgeladen" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Name" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Größe" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 Datei" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} Dateien" @@ -337,4 +338,4 @@ msgstr "Scanne" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "Aktualisiere den Dateisystem-Cache" +msgstr "Aktualisiere den Dateisystem-Cache..." diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index 0a68526442b..1b66b827f10 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -8,13 +8,14 @@ # Phillip Schichtel , 2013. # , 2013. # Susi <>, 2013. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 13:51+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,45 +23,49 @@ msgstr "" "Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Konnte %s nicht entgültig löschen" +msgstr "Konnte %s nicht dauerhaft löschen" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" msgstr "Konnte %s nicht wiederherstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Wiederherstellung ausführen" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" -msgstr "Datei entgültig löschen" +msgstr "Datei dauerhaft löschen" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Name" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Gelöscht" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 Ordner" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} Ordner" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 Datei" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} Dateien" @@ -71,3 +76,7 @@ msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Wiederherstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po index a9ddf034b67..e28090ad621 100644 --- a/l10n/de_DE/files_versions.po +++ b/l10n/de_DE/files_versions.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 23:10+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:16+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 1d9413b7ea7..1cbf04792da 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -13,13 +13,14 @@ # , 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-16 23:30+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:20+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -165,7 +166,7 @@ msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits." #: setup.php:274 msgid "Drop this user from MySQL" -msgstr "Lösche diesen Benutzer von MySQL" +msgstr "Lösche diesen Benutzer aus MySQL" #: setup.php:279 #, php-format @@ -174,7 +175,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "Lösche diesen Benutzer von MySQL." +msgstr "Lösche diesen Benutzer aus MySQL." #: setup.php:553 setup.php:585 #, php-format diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index ad5f7571a56..66515e2199b 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -30,9 +30,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:18+0000\n" -"Last-Translator: robN \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,7 +236,7 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" " certain characters in file names. We strongly suggest to install the " "required packages on your system to support en_US.UTF-8/en_US.UTF8." -msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren." +msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren." #: templates/admin.php:72 msgid "Internet connection not working" @@ -250,7 +250,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." +msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." #: templates/admin.php:89 msgid "Cron" @@ -278,11 +278,11 @@ msgstr "Teilen" #: templates/admin.php:131 msgid "Enable Share API" -msgstr "Teilen-API aktivieren" +msgstr "Share-API aktivieren" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "Erlaube es Anwendungen, die Teilen-API zu benutzen" +msgstr "Erlaube es Anwendungen, die Share-API zu benutzen" #: templates/admin.php:139 msgid "Allow links" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 90f63eae9cd..ad21db5c687 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -15,13 +15,14 @@ # Susi <>, 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:19+0000\n" -"Last-Translator: robN \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:20+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +227,7 @@ msgstr "Nutze TLS" #: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen." +msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen." #: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" @@ -276,7 +277,7 @@ msgstr "Benutzer-Suche Eigenschaften" #: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "Optional; Ein Attribut pro Zeile" +msgstr "Optional; ein Attribut pro Zeile" #: templates/settings.php:72 msgid "Group Display Name Field" diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po index 3592cedb142..d9d63ec77e5 100644 --- a/l10n/de_DE/user_webdavauth.po +++ b/l10n/de_DE/user_webdavauth.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 14:00+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:13+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po index e8ac463bd2b..0a7899ec9e8 100644 --- a/l10n/el/files_trashbin.po +++ b/l10n/el/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Dimitris M. \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Αδύνατη η μόνιμη διαγραφή του %s" @@ -28,35 +28,39 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s" msgid "Couldn't restore %s" msgstr "Αδυναμία επαναφοράς %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "εκτέλεση λειτουργία επαναφοράς" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "μόνιμη διαγραφή αρχείου" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Όνομα" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Διαγράφηκε" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 φάκελος" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} φάκελοι" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 αρχείο" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} αρχεία" @@ -67,3 +71,7 @@ msgstr "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είνα #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Επαναφορά" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po index ba5bf42fbc6..199528ce613 100644 --- a/l10n/eo/files_trashbin.po +++ b/l10n/eo/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nomo" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dosierujo" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dosierujoj" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 dosiero" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} dosierujoj" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaŭri" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index a2db3d575ee..3b4d185f452 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: msvladimir \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No se puede eliminar %s permanentemente" @@ -28,35 +28,39 @@ msgstr "No se puede eliminar %s permanentemente" msgid "Couldn't restore %s" msgstr "No se puede restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Eliminar archivo permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 carpeta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} carpetas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 archivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} archivos" @@ -67,3 +71,7 @@ msgstr "Nada aqui. La papelera esta vacia!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recuperar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 468cd0acfc3..a469e600fc5 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -9,6 +9,7 @@ # , 2011-2012. # , 2011. # oSiNaReF <>, 2012. +# , 2013. # , 2012. # Raul Fernandez Garcia , 2012. # , 2012. @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 19:31+0000\n" +"Last-Translator: pedro.navia \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,23 +159,23 @@ msgstr "Grupo admin" msgid "Delete" msgstr "Eliminar" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Castellano" @@ -264,7 +265,7 @@ msgstr "" #: templates/admin.php:125 msgid "Sharing" -msgstr "" +msgstr "Compartiendo" #: templates/admin.php:131 msgid "Enable Share API" diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po index 138bd484b72..2f47326a19f 100644 --- a/l10n/es_AR/files_trashbin.po +++ b/l10n/es_AR/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: cjtess \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No fue posible borrar %s de manera permanente" @@ -28,35 +28,39 @@ msgstr "No fue posible borrar %s de manera permanente" msgid "Couldn't restore %s" msgstr "No se pudo restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Borrar archivo de manera permanente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Borrado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 directorio" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} directorios" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 archivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} archivos" @@ -67,3 +71,7 @@ msgstr "No hay nada acá. ¡La papelera está vacía!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recuperar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po index 72073ead874..2fdc8f21c91 100644 --- a/l10n/et_EE/files_trashbin.po +++ b/l10n/et_EE/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 18:01+0000\n" -"Last-Translator: Rivo Zängov \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s jäädavalt kustutamine ebaõnnestus" @@ -28,35 +28,39 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus" msgid "Couldn't restore %s" msgstr "%s ei saa taastada" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "soorita taastamine" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "kustuta fail jäädavalt" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nimi" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Kustutatud" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 kaust" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} kausta" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fail" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} faili" @@ -67,3 +71,7 @@ msgstr "Siin pole midagi. Sinu prügikast on tühi!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Taasta" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po index 405582e4205..9f079209293 100644 --- a/l10n/eu/files_trashbin.po +++ b/l10n/eu/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 22:00+0000\n" -"Last-Translator: asieriko \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Ezin izan da %s betirako ezabatu" @@ -28,35 +28,39 @@ msgstr "Ezin izan da %s betirako ezabatu" msgid "Couldn't restore %s" msgstr "Ezin izan da %s berreskuratu" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "berreskuratu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "ezabatu fitxategia betirako" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Izena" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Ezabatuta" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "karpeta bat" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} karpeta" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "fitxategi bat" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fitxategi" @@ -67,3 +71,7 @@ msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Berrezarri" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po index 435d45e463f..c565a07fd29 100644 --- a/l10n/fa/files_trashbin.po +++ b/l10n/fa/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "نام" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 پوشه" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{ شمار} پوشه ها" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 پرونده" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{ شمار } فایل ها" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "بازیابی" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po index e64f9fdafb6..f733faca83e 100644 --- a/l10n/fi_FI/files_trashbin.po +++ b/l10n/fi_FI/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 07:40+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kohdetta %s ei voitu poistaa pysyvästi" @@ -28,35 +28,39 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi" msgid "Couldn't restore %s" msgstr "Kohteen %s palautus epäonnistui" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "suorita palautustoiminto" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "poista tiedosto pysyvästi" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nimi" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Poistettu" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 kansio" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} kansiota" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 tiedosto" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} tiedostoa" @@ -67,3 +71,7 @@ msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Palauta" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 7f4f4cbbf7d..5ea1578792f 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Romain DEP. \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Impossible d'effacer %s de façon permanente" @@ -29,35 +29,39 @@ msgstr "Impossible d'effacer %s de façon permanente" msgid "Couldn't restore %s" msgstr "Impossible de restaurer %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "effectuer l'opération de restauration" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "effacer définitivement le fichier" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Effacé" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dossier" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dossiers" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fichier" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fichiers" @@ -68,3 +72,7 @@ msgstr "Il n'y a rien ici. Votre corbeille est vide !" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurer" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po index 2f1e3e6d86c..feb2788da91 100644 --- a/l10n/gl/files_trashbin.po +++ b/l10n/gl/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Non foi posíbel eliminar %s permanente" @@ -28,35 +28,39 @@ msgstr "Non foi posíbel eliminar %s permanente" msgid "Couldn't restore %s" msgstr "Non foi posíbel restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "realizar a operación de restauración" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "eliminar o ficheiro permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 cartafol" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} cartafoles" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ficheiro" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ficheiros" @@ -67,3 +71,7 @@ msgstr "Aquí non hai nada. O cesto do lixo está baleiro!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restablecer" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po index 3ce0051e74e..d21b9b5d62d 100644 --- a/l10n/he/files_trashbin.po +++ b/l10n/he/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "שם" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "תיקייה אחת" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} תיקיות" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "קובץ אחד" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} קבצים" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po index a0b6e4cede0..2f956fdfd70 100644 --- a/l10n/hi/files_trashbin.po +++ b/l10n/hi/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po index f7162d5dc4f..afa3dc963a5 100644 --- a/l10n/hr/files_trashbin.po +++ b/l10n/hr/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 45b1df8c92a..07e77a3af0d 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 13:30+0000\n" -"Last-Translator: Laszlo Tornoci \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nem sikerült %s végleges törlése" @@ -28,35 +28,39 @@ msgstr "Nem sikerült %s végleges törlése" msgid "Couldn't restore %s" msgstr "Nem sikerült %s visszaállítása" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "a visszaállítás végrehajtása" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "az állomány végleges törlése" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Név" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Törölve" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappa" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fájl" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fájl" @@ -67,3 +71,7 @@ msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Visszaállítás" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po index adba7ebd96f..2099d6718c7 100644 --- a/l10n/ia/files_trashbin.po +++ b/l10n/ia/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nomine" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/id/core.po b/l10n/id/core.po index 3ddaac2d132..ff57644e684 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -390,7 +390,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "reset password ownCloud" diff --git a/l10n/id/files.po b/l10n/id/files.po index 8acd0447cff..5dc41bb1f53 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -93,8 +93,8 @@ msgstr "Hapus" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Menunggu" @@ -152,76 +152,76 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte" -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Terjadi Galat Pengunggahan" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "tutup" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "tautan tidak boleh kosong" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Nama" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Ukuran" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" -msgstr "" +msgstr "1 map" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" -msgstr "" +msgstr "{count} map" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" -msgstr "" +msgstr "1 berkas" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" -msgstr "" +msgstr "{count} berkas" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po index 28191e4f23c..7a7d4d5211d 100644 --- a/l10n/id/files_encryption.po +++ b/l10n/id/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,20 +21,20 @@ msgstr "" #: templates/settings-personal.php:4 templates/settings.php:5 msgid "Encryption" -msgstr "enkripsi" +msgstr "Enkripsi" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "Enkripsi berkas aktif." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "Tipe berkas berikut tidak akan dienkripsi:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "Kecualikan tipe berkas berikut dari enkripsi:" #: templates/settings.php:12 msgid "None" -msgstr "tidak ada" +msgstr "Tidak ada" diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po index cdec2730ac7..eb0c9646b7f 100644 --- a/l10n/id/files_external.po +++ b/l10n/id/files_external.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,102 +21,102 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "akses diberikan" +msgstr "Akses diberikan" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "berikan hak akses" +msgstr "Berikan hak akses" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "isi semua field yang dibutuhkan" +msgstr "Isi semua field yang dibutuhkan" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar." #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive" -#: lib/config.php:434 +#: lib/config.php:398 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Peringatan: \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya." -#: lib/config.php:435 +#: lib/config.php:401 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "Peringatan: Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya." #: templates/settings.php:3 msgid "External Storage" -msgstr "penyimpanan eksternal" +msgstr "Penyimpanan Eksternal" #: templates/settings.php:8 templates/settings.php:22 msgid "Mount point" -msgstr "" +msgstr "Lokasi mount" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Backend" #: templates/settings.php:10 msgid "Configuration" -msgstr "konfigurasi" +msgstr "Konfigurasi" #: templates/settings.php:11 msgid "Options" -msgstr "pilihan" +msgstr "Pilihan" #: templates/settings.php:12 msgid "Applicable" -msgstr "berlaku" +msgstr "Berlaku" #: templates/settings.php:27 msgid "Add mount point" -msgstr "" +msgstr "Tambah lokasi mount" #: templates/settings.php:85 msgid "None set" -msgstr "tidak satupun di set" +msgstr "Tidak satupun di set" #: templates/settings.php:86 msgid "All Users" -msgstr "semua pengguna" +msgstr "Semua Pengguna" #: templates/settings.php:87 msgid "Groups" -msgstr "grup" +msgstr "Grup" #: templates/settings.php:95 msgid "Users" -msgstr "pengguna" +msgstr "Pengguna" #: templates/settings.php:108 templates/settings.php:109 -#: templates/settings.php:149 templates/settings.php:150 +#: templates/settings.php:144 templates/settings.php:145 msgid "Delete" -msgstr "hapus" +msgstr "Hapus" #: templates/settings.php:124 msgid "Enable User External Storage" -msgstr "" +msgstr "Aktifkan Penyimpanan Eksternal Pengguna" #: templates/settings.php:125 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" -msgstr "" +msgstr "Sertifikat root SSL" -#: templates/settings.php:158 +#: templates/settings.php:154 msgid "Import Root Certificate" -msgstr "" +msgstr "Impor Sertifikat Root" diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po index 15be1a566a3..2aae65540f6 100644 --- a/l10n/id/files_trashbin.po +++ b/l10n/id/files_trashbin.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -17,52 +18,60 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Tidak dapat menghapus permanen %s" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Tidak dapat memulihkan %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" -msgstr "" +msgstr "jalankan operasi pemulihan" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" +msgstr "hapus berkas secara permanen" + +#: js/trash.js:121 +msgid "Delete permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:151 templates/index.php:17 msgid "Name" -msgstr "nama" +msgstr "Nama" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "Dihapus" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" -msgstr "" +msgstr "1 map" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" -msgstr "" +msgstr "{count} map" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" -msgstr "" +msgstr "1 berkas" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" -msgstr "" +msgstr "{count} berkas" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Tempat sampah anda kosong!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" +msgstr "Pulihkan" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" msgstr "" diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po index 490e0fc8163..5bf91c3ed03 100644 --- a/l10n/id/files_versions.po +++ b/l10n/id/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:00+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,33 +22,33 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Tidak dapat mengembalikan: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "sukses" #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "Berkas %s telah dikembalikan ke versi %s" #: history.php:49 msgid "failure" -msgstr "" +msgstr "gagal" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "Berkas %s gagal dikembalikan ke versi %s" #: history.php:68 msgid "No old versions available" -msgstr "" +msgstr "Versi lama tidak tersedia" #: history.php:73 msgid "No path specified" -msgstr "" +msgstr "Lokasi tidak ditentukan" #: js/versions.js:16 msgid "History" @@ -55,7 +56,7 @@ msgstr "riwayat" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "" +msgstr "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan" #: templates/settings.php:3 msgid "Files Versioning" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 32d4cfd14ee..12bb079d493 100644 --- a/l10n/id/lib.po +++ b/l10n/id/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-11 15:39+0100\n" -"PO-Revision-Date: 2013-02-11 14:40+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -19,27 +19,27 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "bantu" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "perseorangan" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "pengaturan" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "pengguna" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "aplikasi" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "admin" @@ -51,15 +51,15 @@ msgstr "download ZIP sedang dimatikan" msgid "Files need to be downloaded one by one." msgstr "file harus di unduh satu persatu" -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "kembali ke daftar file" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "file yang dipilih terlalu besar untuk membuat file zip" -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "%s set the database host." msgstr "" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" msgstr "" @@ -127,7 +127,7 @@ msgstr "" msgid "You need to enter either an existing account or the administrator." msgstr "" -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" msgstr "" @@ -135,51 +135,51 @@ msgstr "" msgid "MySQL username and/or password not valid" msgstr "" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" msgstr "" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" msgstr "" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." msgstr "" -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" msgstr "" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" msgstr "" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." msgstr "" -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" msgstr "" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." msgstr "" @@ -236,16 +236,16 @@ msgstr "tahun kemarin" msgid "years ago" msgstr "beberapa tahun lalu" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s tersedia. dapatkan info lebih lanjut" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "terbaru" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "pengecekan pembaharuan sedang non-aktifkan" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 56cc39cb356..cd8cfdfc1d6 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -149,23 +149,23 @@ msgstr "Admin Grup" msgid "Delete" msgstr "Hapus" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__language_name__" @@ -389,7 +389,7 @@ msgstr "" #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Dapatkan aplikasi untuk sinkronisasi berkas anda" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index c105afaa81b..ca5a266207c 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:00+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,23 +21,23 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Gagal menghapus konfigurasi server" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "Konfigurasi valid dan koneksi dapat dilakukan!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya." #: js/settings.js:66 msgid "Deletion failed" @@ -44,267 +45,267 @@ msgstr "penghapusan gagal" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Biarkan pengaturan?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Gagal menambah konfigurasi server" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Tes koneksi sukses" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Tes koneksi gagal" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Anda ingin menghapus Konfigurasi Server saat ini?" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Konfirmasi Penghapusan" #: templates/settings.php:8 msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behaviour. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "" +msgstr "Peringatan: Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya." #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Konfigurasi server" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Tambah Konfigurasi Server" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "host" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" -msgstr "" +msgstr "Base DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" -msgstr "" +msgstr "Satu Base DN per baris" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" -msgstr "" +msgstr "User DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "" +msgstr "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "kata kunci" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "gunakan saringan login" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" -msgstr "" +msgstr "Daftar Filter Pengguna" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Definisikan filter untuk diterapkan saat menerima pengguna." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "saringan grup" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Definisikan filter untuk diterapkan saat menerima grup." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"." -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Pengaturan Koneksi" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" -msgstr "" +msgstr "Konfigurasi Aktif" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Jika tidak dicentang, konfigurasi ini dilewati." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "port" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Host Cadangan (Replika)" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Port Cadangan (Replika)" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" -msgstr "" +msgstr "Nonaktifkan Server Utama" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "gunakan TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "matikan validasi sertivikat SSL" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "tidak disarankan, gunakan hanya untuk pengujian." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "dalam detik. perubahan mengosongkan cache" -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" -msgstr "" +msgstr "Pengaturan Direktori" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" -msgstr "" +msgstr "Bidang Tampilan Nama Pengguna" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud." -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" -msgstr "" +msgstr "Pohon Pengguna Dasar" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" -msgstr "" +msgstr "Satu Pengguna Base DN per baris" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" -msgstr "" +msgstr "Atribut Pencarian Pengguna" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Pilihan; satu atribut per baris" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" -msgstr "" +msgstr "Bidang Tampilan Nama Grup" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud." -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" -msgstr "" +msgstr "Pohon Grup Dasar" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" -msgstr "" +msgstr "Satu Grup Base DN per baris" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" -msgstr "" +msgstr "Atribut Pencarian Grup" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" -msgstr "" +msgstr "asosiasi Anggota-Grup" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" -msgstr "" +msgstr "Atribut Khusus" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "dalam bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "bantuan" diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po index 858d3ee0764..8af5dc9fdda 100644 --- a/l10n/is/files_trashbin.po +++ b/l10n/is/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nafn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} möppur" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 skrá" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} skrár" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po index f696193957d..92dd72ca00f 100644 --- a/l10n/it/files_trashbin.po +++ b/l10n/it/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Impossibile eliminare %s definitivamente" @@ -28,35 +28,39 @@ msgstr "Impossibile eliminare %s definitivamente" msgid "Couldn't restore %s" msgstr "Impossibile ripristinare %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "esegui operazione di ripristino" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "elimina il file definitivamente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminati" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 cartella" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} cartelle" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 file" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} file" @@ -67,3 +71,7 @@ msgstr "Qui non c'è niente. Il tuo cestino è vuoto." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Ripristina" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po index a81dae25c6e..b81d8647126 100644 --- a/l10n/ja_JP/files_trashbin.po +++ b/l10n/ja_JP/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ja_JP\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s を完全に削除出来ませんでした" @@ -28,35 +28,39 @@ msgstr "%s を完全に削除出来ませんでした" msgid "Couldn't restore %s" msgstr "%s を復元出来ませんでした" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "復元操作を実行する" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "ファイルを完全に削除する" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名前" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "削除済み" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 フォルダ" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} フォルダ" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ファイル" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ファイル" @@ -67,3 +71,7 @@ msgstr "ここには何もありません。ゴミ箱は空です！" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "復元" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po index 89f7efa5b69..499f14ca8c7 100644 --- a/l10n/ka_GE/files_trashbin.po +++ b/l10n/ka_GE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ka_GE\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "სახელი" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 საქაღალდე" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} საქაღალდე" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ფაილი" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ფაილი" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po index d03c3476b2e..5271e9cf042 100644 --- a/l10n/ko/files_trashbin.po +++ b/l10n/ko/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "이름" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "폴더 1개" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "폴더 {count}개" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "파일 1개" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "파일 {count}개" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "복원" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po index 03fa59c5804..a4a5d2ace62 100644 --- a/l10n/ku_IQ/files_trashbin.po +++ b/l10n/ku_IQ/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ku_IQ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "ناو" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po index 5b1856decdf..b4f7cfe3a39 100644 --- a/l10n/lb/files_trashbin.po +++ b/l10n/lb/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Numm" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po index 928d63096ca..1414400ddc7 100644 --- a/l10n/lt_LT/files_trashbin.po +++ b/l10n/lt_LT/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: lt_LT\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Pavadinimas" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 aplankalas" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} aplankalai" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 failas" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} failai" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po index 71b39e763bc..7710bac8daf 100644 --- a/l10n/lv/files_trashbin.po +++ b/l10n/lv/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Rūdolfs Mazurs \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nevarēja pilnībā izdzēst %s" @@ -28,35 +28,39 @@ msgstr "Nevarēja pilnībā izdzēst %s" msgid "Couldn't restore %s" msgstr "Nevarēja atjaunot %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "veikt atjaunošanu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "dzēst datni pavisam" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nosaukums" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Dzēsts" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mape" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapes" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 datne" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} datnes" @@ -67,3 +71,7 @@ msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Atjaunot" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po index 173bc01b4e9..609e2410e6a 100644 --- a/l10n/mk/files_trashbin.po +++ b/l10n/mk/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папки" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 датотека" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} датотеки" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po index 7924d440e3c..513d1b9832c 100644 --- a/l10n/ms_MY/files_trashbin.po +++ b/l10n/ms_MY/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ms_MY\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nama" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po new file mode 100644 index 00000000000..66f60cd7819 --- /dev/null +++ b/l10n/my_MM/core.po @@ -0,0 +1,594 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Pyae Sone , 2013. +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 10:30+0000\n" +"Last-Translator: Pyae Sone \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/share.php:85 +#, php-format +msgid "User %s shared a file with you" +msgstr "" + +#: ajax/share.php:87 +#, php-format +msgid "User %s shared a folder with you" +msgstr "" + +#: ajax/share.php:89 +#, php-format +msgid "" +"User %s shared the file \"%s\" with you. It is available for download here: " +"%s" +msgstr "" + +#: ajax/share.php:91 +#, php-format +msgid "" +"User %s shared the folder \"%s\" with you. It is available for download " +"here: %s" +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:32 +msgid "Monday" +msgstr "" + +#: js/config.php:32 +msgid "Tuesday" +msgstr "" + +#: js/config.php:32 +msgid "Wednesday" +msgstr "" + +#: js/config.php:32 +msgid "Thursday" +msgstr "" + +#: js/config.php:32 +msgid "Friday" +msgstr "" + +#: js/config.php:32 +msgid "Saturday" +msgstr "" + +#: js/config.php:33 +msgid "January" +msgstr "" + +#: js/config.php:33 +msgid "February" +msgstr "" + +#: js/config.php:33 +msgid "March" +msgstr "" + +#: js/config.php:33 +msgid "April" +msgstr "" + +#: js/config.php:33 +msgid "May" +msgstr "" + +#: js/config.php:33 +msgid "June" +msgstr "" + +#: js/config.php:33 +msgid "July" +msgstr "" + +#: js/config.php:33 +msgid "August" +msgstr "" + +#: js/config.php:33 +msgid "September" +msgstr "" + +#: js/config.php:33 +msgid "October" +msgstr "" + +#: js/config.php:33 +msgid "November" +msgstr "" + +#: js/config.php:33 +msgid "December" +msgstr "" + +#: js/js.js:286 +msgid "Settings" +msgstr "" + +#: js/js.js:767 +msgid "seconds ago" +msgstr "" + +#: js/js.js:768 +msgid "1 minute ago" +msgstr "" + +#: js/js.js:769 +msgid "{minutes} minutes ago" +msgstr "" + +#: js/js.js:770 +msgid "1 hour ago" +msgstr "" + +#: js/js.js:771 +msgid "{hours} hours ago" +msgstr "" + +#: js/js.js:772 +msgid "today" +msgstr "" + +#: js/js.js:773 +msgid "yesterday" +msgstr "" + +#: js/js.js:774 +msgid "{days} days ago" +msgstr "" + +#: js/js.js:775 +msgid "last month" +msgstr "" + +#: js/js.js:776 +msgid "{months} months ago" +msgstr "" + +#: js/js.js:777 +msgid "months ago" +msgstr "" + +#: js/js.js:778 +msgid "last year" +msgstr "" + +#: js/js.js:779 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:126 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:162 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:163 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:180 +msgid "Ok" +msgstr "" + +#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 +#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 +msgid "The object type is not specified." +msgstr "" + +#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 +#: js/share.js:594 +msgid "Error" +msgstr "" + +#: js/oc-vcategories.js:179 +msgid "The app name is not specified." +msgstr "" + +#: js/oc-vcategories.js:194 +msgid "The required file {file} is not installed!" +msgstr "" + +#: js/share.js:29 js/share.js:43 js/share.js:90 +msgid "Shared" +msgstr "" + +#: js/share.js:93 +msgid "Share" +msgstr "" + +#: js/share.js:141 js/share.js:622 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:152 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:159 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:168 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:170 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:175 +msgid "Share with" +msgstr "" + +#: js/share.js:180 +msgid "Share with link" +msgstr "" + +#: js/share.js:183 +msgid "Password protect" +msgstr "" + +#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +msgid "Password" +msgstr "" + +#: js/share.js:189 +msgid "Email link to person" +msgstr "" + +#: js/share.js:190 +msgid "Send" +msgstr "" + +#: js/share.js:194 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:195 +msgid "Expiration date" +msgstr "" + +#: js/share.js:227 +msgid "Share via email:" +msgstr "" + +#: js/share.js:229 +msgid "No people found" +msgstr "" + +#: js/share.js:256 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:292 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:313 +msgid "Unshare" +msgstr "" + +#: js/share.js:325 +msgid "can edit" +msgstr "" + +#: js/share.js:327 +msgid "access control" +msgstr "" + +#: js/share.js:330 +msgid "create" +msgstr "" + +#: js/share.js:333 +msgid "update" +msgstr "" + +#: js/share.js:336 +msgid "delete" +msgstr "" + +#: js/share.js:339 +msgid "share" +msgstr "" + +#: js/share.js:373 js/share.js:569 +msgid "Password protected" +msgstr "" + +#: js/share.js:582 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:594 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:609 +msgid "Sending ..." +msgstr "" + +#: js/share.js:620 +msgid "Email sent" +msgstr "" + +#: js/update.js:14 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:18 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:48 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Reset email send." +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Request failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:14 +msgid "Request reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 +msgid "Apps" +msgstr "Apps" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:23 templates/installation.php:30 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:24 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:25 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:31 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:36 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:52 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:54 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:61 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:66 templates/installation.php:77 +#: templates/installation.php:87 templates/installation.php:97 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:113 +msgid "Database password" +msgstr "" + +#: templates/installation.php:117 +msgid "Database name" +msgstr "" + +#: templates/installation.php:125 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:131 +msgid "Database host" +msgstr "" + +#: templates/installation.php:136 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:33 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:48 +msgid "Log out" +msgstr "" + +#: templates/login.php:10 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:11 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:13 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:19 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:41 +msgid "remember" +msgstr "" + +#: templates/login.php:43 +msgid "Log in" +msgstr "" + +#: templates/login.php:49 +msgid "Alternative Logins" +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po new file mode 100644 index 00000000000..528f0857ecf --- /dev/null +++ b/l10n/my_MM/files.po @@ -0,0 +1,315 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/rename.php:22 ajax/rename.php:25 +msgid "Unable to rename file" +msgstr "" + +#: ajax/upload.php:19 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:26 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:27 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:29 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:31 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:32 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:33 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:34 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:52 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:83 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:10 +msgid "Files" +msgstr "" + +#: js/fileactions.js:125 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92 +msgid "Delete" +msgstr "" + +#: js/fileactions.js:193 +msgid "Rename" +msgstr "" + +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 +msgid "Pending" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "replace" +msgstr "" + +#: js/filelist.js:253 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "cancel" +msgstr "" + +#: js/filelist.js:295 +msgid "replaced {new_name}" +msgstr "" + +#: js/filelist.js:295 js/filelist.js:297 +msgid "undo" +msgstr "" + +#: js/filelist.js:297 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:322 +msgid "perform delete operation" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:225 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:262 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:262 +msgid "Upload Error" +msgstr "" + +#: js/files.js:273 +msgid "Close" +msgstr "" + +#: js/files.js:312 +msgid "1 file uploading" +msgstr "" + +#: js/files.js:315 js/files.js:370 js/files.js:385 +msgid "{count} files uploading" +msgstr "" + +#: js/files.js:388 js/files.js:423 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:497 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:570 +msgid "URL cannot be empty." +msgstr "" + +#: js/files.js:575 +msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" +msgstr "" + +#: js/files.js:949 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/files.js:950 templates/index.php:78 +msgid "Size" +msgstr "" + +#: js/files.js:951 templates/index.php:80 +msgid "Modified" +msgstr "" + +#: js/files.js:970 +msgid "1 folder" +msgstr "" + +#: js/files.js:972 +msgid "{count} folders" +msgstr "" + +#: js/files.js:980 +msgid "1 file" +msgstr "" + +#: js/files.js:982 +msgid "{count} files" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:85 templates/index.php:86 +msgid "Unshare" +msgstr "" + +#: templates/index.php:105 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:107 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:112 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:115 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po new file mode 100644 index 00000000000..e6b714b2cb4 --- /dev/null +++ b/l10n/my_MM/files_encryption.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings-personal.php:4 templates/settings.php:5 +msgid "Encryption" +msgstr "" + +#: templates/settings-personal.php:7 +msgid "File encryption is enabled." +msgstr "" + +#: templates/settings-personal.php:11 +msgid "The following file types will not be encrypted:" +msgstr "" + +#: templates/settings.php:7 +msgid "Exclude the following file types from encryption:" +msgstr "" + +#: templates/settings.php:12 +msgid "None" +msgstr "" diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po new file mode 100644 index 00000000000..4e24ec05550 --- /dev/null +++ b/l10n/my_MM/files_external.po @@ -0,0 +1,120 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:73 js/google.js:72 +msgid "Fill out all required fields" +msgstr "" + +#: js/dropbox.js:85 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:26 js/google.js:73 js/google.js:78 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:398 +msgid "" +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " +"is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:401 +msgid "" +"Warning: The FTP support in PHP is not enabled or installed. Mounting" +" of FTP shares is not possible. Please ask your system administrator to " +"install it." +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:22 +msgid "Mount point" +msgstr "" + +#: templates/settings.php:9 +msgid "Backend" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:27 +msgid "Add mount point" +msgstr "" + +#: templates/settings.php:85 +msgid "None set" +msgstr "" + +#: templates/settings.php:86 +msgid "All Users" +msgstr "" + +#: templates/settings.php:87 +msgid "Groups" +msgstr "" + +#: templates/settings.php:95 +msgid "Users" +msgstr "" + +#: templates/settings.php:108 templates/settings.php:109 +#: templates/settings.php:144 templates/settings.php:145 +msgid "Delete" +msgstr "" + +#: templates/settings.php:124 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:125 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:136 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:154 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po new file mode 100644 index 00000000000..2886a4d02bc --- /dev/null +++ b/l10n/my_MM/files_sharing.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:9 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:11 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:14 templates/public.php:30 +msgid "Download" +msgstr "" + +#: templates/public.php:29 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:35 +msgid "web services under your control" +msgstr "" diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po new file mode 100644 index 00000000000..33f2492dba1 --- /dev/null +++ b/l10n/my_MM/files_trashbin.po @@ -0,0 +1,76 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/delete.php:40 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:41 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:96 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:34 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:152 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:161 +msgid "1 folder" +msgstr "" + +#: js/trash.js:163 +msgid "{count} folders" +msgstr "" + +#: js/trash.js:171 +msgid "1 file" +msgstr "" + +#: js/trash.js:173 +msgid "{count} files" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po new file mode 100644 index 00000000000..4fac18084e1 --- /dev/null +++ b/l10n/my_MM/files_versions.po @@ -0,0 +1,65 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/rollbackVersion.php:15 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: history.php:40 +msgid "success" +msgstr "" + +#: history.php:42 +#, php-format +msgid "File %s was reverted to version %s" +msgstr "" + +#: history.php:49 +msgid "failure" +msgstr "" + +#: history.php:51 +#, php-format +msgid "File %s could not be reverted to version %s" +msgstr "" + +#: history.php:68 +msgid "No old versions available" +msgstr "" + +#: history.php:73 +msgid "No path specified" +msgstr "" + +#: js/versions.js:16 +msgid "History" +msgstr "" + +#: templates/history.php:20 +msgid "Revert a file to a previous version by clicking on its revert button" +msgstr "" + +#: templates/settings.php:3 +msgid "Files Versioning" +msgstr "" + +#: templates/settings.php:4 +msgid "Enable" +msgstr "" diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po new file mode 100644 index 00000000000..456137d82d4 --- /dev/null +++ b/l10n/my_MM/lib.po @@ -0,0 +1,253 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: app.php:349 +msgid "Help" +msgstr "" + +#: app.php:362 +msgid "Personal" +msgstr "" + +#: app.php:373 +msgid "Settings" +msgstr "" + +#: app.php:385 +msgid "Users" +msgstr "" + +#: app.php:398 +msgid "Apps" +msgstr "Apps" + +#: app.php:406 +msgid "Admin" +msgstr "" + +#: files.php:202 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:203 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:204 files.php:231 +msgid "Back to Files" +msgstr "" + +#: files.php:228 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: helper.php:228 +msgid "couldn't be determined" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup.php:34 +msgid "Set an admin username." +msgstr "" + +#: setup.php:37 +msgid "Set an admin password." +msgstr "" + +#: setup.php:40 +msgid "Specify a data folder." +msgstr "" + +#: setup.php:53 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup.php:56 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup.php:59 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup.php:62 +#, php-format +msgid "%s set the database host." +msgstr "" + +#: setup.php:126 setup.php:294 setup.php:339 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:127 setup.php:150 setup.php:204 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup.php:149 setup.php:427 setup.php:494 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup.php:203 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup.php:273 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup.php:274 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup.php:279 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup.php:280 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup.php:553 setup.php:585 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup.php:649 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:651 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template.php:113 +msgid "seconds ago" +msgstr "" + +#: template.php:114 +msgid "1 minute ago" +msgstr "" + +#: template.php:115 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:116 +msgid "1 hour ago" +msgstr "" + +#: template.php:117 +#, php-format +msgid "%d hours ago" +msgstr "" + +#: template.php:118 +msgid "today" +msgstr "" + +#: template.php:119 +msgid "yesterday" +msgstr "" + +#: template.php:120 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:121 +msgid "last month" +msgstr "" + +#: template.php:122 +#, php-format +msgid "%d months ago" +msgstr "" + +#: template.php:123 +msgid "last year" +msgstr "" + +#: template.php:124 +msgid "years ago" +msgstr "" + +#: updater.php:78 +#, php-format +msgid "%s is available. Get more information" +msgstr "" + +#: updater.php:81 +msgid "up to date" +msgstr "" + +#: updater.php:84 +msgid "updates check is disabled" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po new file mode 100644 index 00000000000..ade1a7d73e5 --- /dev/null +++ b/l10n/my_MM/settings.po @@ -0,0 +1,496 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15 +#: ajax/togglegroups.php:18 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:32 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/enableapp.php:11 +msgid "Could not enable app. " +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:24 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:28 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:34 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:30 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:36 js/apps.js:76 +msgid "Disable" +msgstr "" + +#: js/apps.js:36 js/apps.js:64 +msgid "Enable" +msgstr "" + +#: js/apps.js:55 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:84 +msgid "Updating...." +msgstr "" + +#: js/apps.js:87 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:87 +msgid "Error" +msgstr "" + +#: js/apps.js:90 +msgid "Updated" +msgstr "" + +#: js/personal.js:96 +msgid "Saving..." +msgstr "" + +#: js/users.js:30 +msgid "deleted" +msgstr "" + +#: js/users.js:30 +msgid "undo" +msgstr "" + +#: js/users.js:62 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:75 templates/users.php:26 templates/users.php:80 +#: templates/users.php:105 +msgid "Groups" +msgstr "" + +#: js/users.js:78 templates/users.php:82 templates/users.php:119 +msgid "Group Admin" +msgstr "" + +#: js/users.js:99 templates/users.php:161 +msgid "Delete" +msgstr "" + +#: js/users.js:191 +msgid "add group" +msgstr "" + +#: js/users.js:352 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:353 js/users.js:359 js/users.js:374 +msgid "Error creating user" +msgstr "" + +#: js/users.js:358 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:29 personal.php:30 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file that ownCloud provides is not working. We " +"strongly suggest that you configure your webserver in a way that the data " +"directory is no longer accessible or you move the data directory outside the" +" webserver document root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:61 +msgid "" +"This ownCloud server can't set system locale to " +"\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with" +" certain characters in file names. We strongly suggest to install the " +"required packages on your system to support en_US.UTF-8/en_US.UTF8." +msgstr "" + +#: templates/admin.php:72 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:75 +msgid "" +"This ownCloud server has no working internet connection. This means that " +"some of the features like mounting of external storage, notifications about " +"updates or installation of 3rd party apps don´t work. Accessing files from " +"remote and sending of notification emails might also not work. We suggest to" +" enable internet connection for this server if you want to have all features" +" of ownCloud." +msgstr "" + +#: templates/admin.php:89 +msgid "Cron" +msgstr "" + +#: templates/admin.php:98 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:108 +msgid "" +"cron.php is registered at a webcron service. Call the cron.php page in the " +"owncloud root once a minute over http." +msgstr "" + +#: templates/admin.php:118 +msgid "" +"Use systems cron service. Call the cron.php file in the owncloud folder via " +"a system cronjob once a minute." +msgstr "" + +#: templates/admin.php:125 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:131 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:132 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:139 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:140 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:147 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:148 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:155 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:158 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:165 +msgid "Security" +msgstr "" + +#: templates/admin.php:178 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:179 +msgid "" +"Enforces the clients to connect to ownCloud via an encrypted connection." +msgstr "" + +#: templates/admin.php:182 +msgid "" +"Please connect to this ownCloud instance via HTTPS to enable or disable the " +"SSL enforcement." +msgstr "" + +#: templates/admin.php:192 +msgid "Log" +msgstr "" + +#: templates/admin.php:193 +msgid "Log level" +msgstr "" + +#: templates/admin.php:220 +msgid "More" +msgstr "" + +#: templates/admin.php:227 templates/personal.php:98 +msgid "Version" +msgstr "" + +#: templates/admin.php:230 templates/personal.php:100 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:11 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:24 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:28 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:29 +msgid "-licensed by " +msgstr "" + +#: templates/apps.php:31 +msgid "Update" +msgstr "" + +#: templates/help.php:3 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:4 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:7 +msgid "Forum" +msgstr "" + +#: templates/help.php:9 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:11 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:14 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:25 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:36 templates/users.php:23 templates/users.php:79 +msgid "Password" +msgstr "" + +#: templates/personal.php:37 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:38 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:39 +msgid "Current password" +msgstr "" + +#: templates/personal.php:40 +msgid "New password" +msgstr "" + +#: templates/personal.php:42 +msgid "Change password" +msgstr "" + +#: templates/personal.php:54 templates/users.php:78 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:55 +msgid "Your display name was changed" +msgstr "" + +#: templates/personal.php:56 +msgid "Unable to change your display name" +msgstr "" + +#: templates/personal.php:59 +msgid "Change display name" +msgstr "" + +#: templates/personal.php:68 +msgid "Email" +msgstr "" + +#: templates/personal.php:69 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:70 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:76 templates/personal.php:77 +msgid "Language" +msgstr "" + +#: templates/personal.php:82 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:87 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:89 +msgid "Use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/users.php:21 templates/users.php:77 +msgid "Login Name" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:41 templates/users.php:139 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:59 templates/users.php:154 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Storage" +msgstr "" + +#: templates/users.php:95 +msgid "change display name" +msgstr "" + +#: templates/users.php:99 +msgid "set new password" +msgstr "" + +#: templates/users.php:134 +msgid "Default" +msgstr "" diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po new file mode 100644 index 00000000000..3c0718016b5 --- /dev/null +++ b/l10n/my_MM/user_ldap.po @@ -0,0 +1,309 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:121 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:126 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:136 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:137 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:8 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:15 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:23 +msgid "Host" +msgstr "" + +#: templates/settings.php:25 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:26 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:27 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:28 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:30 +msgid "User DN" +msgstr "" + +#: templates/settings.php:32 +msgid "" +"The DN of the client user with which the bind shall be done, e.g. " +"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " +"empty." +msgstr "" + +#: templates/settings.php:33 +msgid "Password" +msgstr "" + +#: templates/settings.php:36 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:37 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:40 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:41 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:42 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:45 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:46 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:47 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:50 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:51 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:55 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:57 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:57 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:58 +msgid "Port" +msgstr "" + +#: templates/settings.php:59 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:59 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:60 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:61 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:61 +msgid "When switched on, ownCloud will only connect to the replica server." +msgstr "" + +#: templates/settings.php:62 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:62 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:63 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:64 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:64 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:64 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:65 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:67 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:69 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:69 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:70 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:70 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:71 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:71 templates/settings.php:74 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:72 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:72 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:73 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:73 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:74 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:75 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:77 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:80 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:82 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:86 +msgid "Help" +msgstr "" diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po new file mode 100644 index 00000000000..45d8ff660d3 --- /dev/null +++ b/l10n/my_MM/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "URL: http://" +msgstr "" + +#: templates/settings.php:7 +msgid "" +"ownCloud will send the user credentials to this URL. This plugin checks the " +"response and will interpret the HTTP statuscodes 401 and 403 as invalid " +"credentials, and all other responses as valid credentials." +msgstr "" diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po index d745e979401..81d8126f331 100644 --- a/l10n/nb_NO/files_trashbin.po +++ b/l10n/nb_NO/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Navn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappe" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapper" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po index 3798b0d1161..e418e34f1d4 100644 --- a/l10n/nl/files_trashbin.po +++ b/l10n/nl/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kon %s niet permanent verwijderen" @@ -28,35 +28,39 @@ msgstr "Kon %s niet permanent verwijderen" msgid "Couldn't restore %s" msgstr "Kon %s niet herstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "uitvoeren restore operatie" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "verwijder bestanden definitief" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Naam" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Verwijderd" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 map" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappen" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 bestand" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} bestanden" @@ -67,3 +71,7 @@ msgstr "Niets te vinden. Uw prullenbak is leeg!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Herstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po index 43941fff2c7..ef3eb612853 100644 --- a/l10n/nn_NO/files_trashbin.po +++ b/l10n/nn_NO/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Namn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po index f3243c02aa8..318cc3209bc 100644 --- a/l10n/oc/files_trashbin.po +++ b/l10n/oc/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: oc\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index eea8ff8f6d6..a793874bb44 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nazwa" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 folder" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} foldery" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 plik" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} pliki" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Przywróć" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po index d35b236c8f8..e158e5a65ee 100644 --- a/l10n/pl_PL/files_trashbin.po +++ b/l10n/pl_PL/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 9e297e235b1..dc448a8091a 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,15 +10,16 @@ # Rodrigo Tavares , 2013. # , 2012. # Thiago Vicente , 2012. +# Tulio Simoes Martins Padilha , 2013. # Unforgiving Fallout <>, 2012. # Van Der Fran , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 20:00+0000\n" +"Last-Translator: tuliouel \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,8 +100,8 @@ msgstr "Excluir" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Pendente" @@ -158,74 +159,74 @@ msgstr "Seu armazenamento está cheio, arquivos não serão mais atualizados nem msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Erro de envio" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Fechar" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "enviando 1 arquivo" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "Enviando {count} arquivos" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "URL não pode ficar em branco" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Nome" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Tamanho" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Modificado" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 pasta" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} pastas" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 arquivo" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} arquivos" @@ -283,7 +284,7 @@ msgstr "Do link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Arquivos apagados" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po index e5e109080a8..f506517b437 100644 --- a/l10n/pt_BR/files_trashbin.po +++ b/l10n/pt_BR/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 00:00+0000\n" -"Last-Translator: rodrigost23 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Não foi possível excluir %s permanentemente" @@ -28,35 +28,39 @@ msgstr "Não foi possível excluir %s permanentemente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "realizar operação de restauração" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "excluir arquivo permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Excluído" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 pasta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} pastas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 arquivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} arquivos" @@ -67,3 +71,7 @@ msgstr "Nada aqui. Sua lixeira está vazia!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index f3ba82a97b8..31113fe0d42 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:10+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 20:00+0000\n" "Last-Translator: tuliouel \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "Remoção falhou" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Tomar parámetros de recente configuração de servidor?" #: js/settings.js:83 msgid "Keep settings?" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index 653dc5d2337..87268e151af 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Mouxy \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Não foi possível eliminar %s de forma permanente" @@ -28,35 +28,39 @@ msgstr "Não foi possível eliminar %s de forma permanente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Eliminar permanentemente o(s) ficheiro(s)" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Apagado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 pasta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} pastas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ficheiro" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ficheiros" @@ -67,3 +71,7 @@ msgstr "Não ha ficheiros. O lixo está vazio" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po index 441c56d5980..11f9c763eff 100644 --- a/l10n/ro/files_trashbin.po +++ b/l10n/ro/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nume" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 folder" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} foldare" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fisier" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fisiere" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po index cef3725c583..0ad24b090e6 100644 --- a/l10n/ru/files_trashbin.po +++ b/l10n/ru/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Langaru \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s не может быть удалён навсегда" @@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда" msgid "Couldn't restore %s" msgstr "%s не может быть восстановлен" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "выполнить операцию восстановления" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "удалить файл навсегда" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Имя" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Удалён" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файлов" @@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Восстановить" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po index 987521a7961..f628f06decf 100644 --- a/l10n/ru_RU/files_trashbin.po +++ b/l10n/ru_RU/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Langaru \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ru_RU\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s не может быть удалён навсегда" @@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда" msgid "Couldn't restore %s" msgstr "%s не может быть восстановлен" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "выполнить операцию восстановления" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "удалить файл навсегда" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Имя" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Удалён" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{количество} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{количество} файлов" @@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Восстановить" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po index e19b02db18b..da9e298b802 100644 --- a/l10n/si_LK/files_trashbin.po +++ b/l10n/si_LK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: si_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "නම" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 ෆොල්ඩරයක්" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ගොනුවක්" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po index 86550447566..99f8cea940a 100644 --- a/l10n/sk/files_trashbin.po +++ b/l10n/sk/files_trashbin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-09 00:12+0100\n" -"PO-Revision-Date: 2013-01-31 16:03+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po index c1d5863d679..bf92afc5fa9 100644 --- a/l10n/sk_SK/files_trashbin.po +++ b/l10n/sk_SK/files_trashbin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: mhh \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nemožno zmazať %s navždy" @@ -29,35 +29,39 @@ msgstr "Nemožno zmazať %s navždy" msgid "Couldn't restore %s" msgstr "Nemožno obnoviť %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "vykonať obnovu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "trvalo zmazať súbor" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Meno" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Zmazané" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 priečinok" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} priečinkov" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 súbor" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} súborov" @@ -68,3 +72,7 @@ msgstr "Žiadny obsah. Kôš je prázdny!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Obnoviť" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po index 6bcfe28d48a..4d498e2143b 100644 --- a/l10n/sl/files_trashbin.po +++ b/l10n/sl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mapa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} map" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 datoteka" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} datotek" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po index 4e1a43a0495..90efd4e6283 100644 --- a/l10n/sr/files_trashbin.po +++ b/l10n/sr/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -28,35 +28,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "врати у претходно стање" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Обрисано" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 фасцикла" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} фасцикле/и" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 датотека" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} датотеке/а" @@ -67,3 +71,7 @@ msgstr "Овде нема ништа. Корпа за отпатке је пра #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Врати" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po index a96b8aed4fc..3e8b5838ae0 100644 --- a/l10n/sr@latin/files_trashbin.po +++ b/l10n/sr@latin/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po index 94410d99b97..552ab178fe1 100644 --- a/l10n/sv/files_trashbin.po +++ b/l10n/sv/files_trashbin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kunde inte radera %s permanent" @@ -29,35 +29,39 @@ msgstr "Kunde inte radera %s permanent" msgid "Couldn't restore %s" msgstr "Kunde inte återställa %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "utför återställning" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "radera filen permanent" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Namn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Raderad" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mapp" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappar" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -68,3 +72,7 @@ msgstr "Ingenting här. Din papperskorg är tom!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Återskapa" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po index 91113e58ba9..b7f72239297 100644 --- a/l10n/sw_KE/files_trashbin.po +++ b/l10n/sw_KE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sw_KE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po index aa8e5682663..a58afea6b48 100644 --- a/l10n/ta_LK/files_trashbin.po +++ b/l10n/ta_LK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ta_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "பெயர்" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 கோப்புறை" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{எண்ணிக்கை} கோப்புறைகள்" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 கோப்பு" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{எண்ணிக்கை} கோப்புகள்" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index bd782be12d2..02df7b5a057 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -386,7 +386,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 7d45d571c9d..8f2efdd4430 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,8 +90,8 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "" @@ -149,74 +149,74 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "" -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index b27519c01e6..cc8e3d0e294 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 6e98b59654a..d6eea5a4573 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index c1f7c6dcd28..2741ea4adfa 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 0e34b311a8f..c54923762dc 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ajax/delete.php:24 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 0339eb09170..fa264617a0d 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 53147fb1c57..3c8268ee926 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 6403daf074a..5191c36b21b 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index cbc32af4131..a8cee2070de 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 15865d8de37..03867180c98 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po index b7f0801c5e2..f97e95d3987 100644 --- a/l10n/th_TH/files_trashbin.po +++ b/l10n/th_TH/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -28,35 +28,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "ดำเนินการคืนค่า" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "ชื่อ" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "ลบแล้ว" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 โฟลเดอร์" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} โฟลเดอร์" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ไฟล์" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ไฟล์" @@ -67,3 +71,7 @@ msgstr "ไม่มีอะไรอยู่ในนี้ ถังขย #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "คืนค่า" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index 22a2d9527f2..2283359981a 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 20:10+0000\n" -"Last-Translator: atakan96 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s Kalıcı olarak silinemedi" @@ -28,35 +28,39 @@ msgstr "%s Kalıcı olarak silinemedi" msgid "Couldn't restore %s" msgstr "%s Geri yüklenemedi" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Geri yükleme işlemini gerçekleştir" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Dosyayı kalıcı olarak sil" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "İsim" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Silindi" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dizin" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dizin" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 dosya" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} dosya" @@ -67,3 +71,7 @@ msgstr "Burası boş. Çöp kutun tamamen boş." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Geri yükle" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po index 7f2bd9d813e..aaaca834b68 100644 --- a/l10n/uk/files_trashbin.po +++ b/l10n/uk/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-20 00:02+0100\n" -"PO-Revision-Date: 2013-02-19 14:20+0000\n" -"Last-Translator: volodya327 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:24 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Неможливо видалити %s назавжди" @@ -28,35 +28,39 @@ msgstr "Неможливо видалити %s назавжди" msgid "Couldn't restore %s" msgstr "Неможливо відновити %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "виконати операцію відновлення" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "видалити файл назавжди" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ім'я" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Видалено" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файлів" @@ -67,3 +71,7 @@ msgstr "Нічого немає. Ваший кошик для сміття пу #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Відновити" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po index c5b1c4de22b..c4ebe67d893 100644 --- a/l10n/vi/files_trashbin.po +++ b/l10n/vi/files_trashbin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: saosangm \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Không thể óa %s vĩnh viễn" @@ -28,35 +28,39 @@ msgstr "Không thể óa %s vĩnh viễn" msgid "Couldn't restore %s" msgstr "Không thể khôi phục %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "thực hiện phục hồi" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "xóa file vĩnh viễn" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Tên" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Đã xóa" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 thư mục" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} thư mục" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 tập tin" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} tập tin" @@ -67,3 +71,7 @@ msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Khôi phục" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po index 4432759cfe3..2b3b09a9e12 100644 --- a/l10n/zh_CN.GB2312/files_trashbin.po +++ b/l10n/zh_CN.GB2312/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_CN.GB2312\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名称" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 个文件夹" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 个文件" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 个文件" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po index 74ce3be6ba6..a2f415f760c 100644 --- a/l10n/zh_CN/files_trashbin.po +++ b/l10n/zh_CN/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名称" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1个文件夹" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 个文件" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 个文件" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po index 4d462824758..3619584ba4d 100644 --- a/l10n/zh_HK/files_trashbin.po +++ b/l10n/zh_HK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po index ae0e1da91d8..347608bd4e7 100644 --- a/l10n/zh_TW/files_trashbin.po +++ b/l10n/zh_TW/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名稱" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 個資料夾" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 個資料夾" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 個檔案" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 個檔案" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 0ad254ad844..87b0b29469c 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -9,7 +9,7 @@ "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.", "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", -"couldn't be determined" => "Konnte nicht festgestellt werden", +"couldn't be determined" => "konnte nicht festgestellt werden", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.", @@ -18,7 +18,7 @@ "Images" => "Bilder", "Set an admin username." => "Setze Administrator Benutzername.", "Set an admin password." => "Setze Administrator Passwort", -"Specify a data folder." => "Datei-Verzeichnis angeben", +"Specify a data folder." => "Datei-Verzeichnis angeben.", "%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.", "%s enter the database name." => "%s gib den Datenbank-Namen an.", "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten", @@ -32,7 +32,7 @@ "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.", "Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits", -"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.", +"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfe die Instalationsanleitungen.", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 1f63fdd87b0..d04c691f7ec 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -30,9 +30,9 @@ "DB Error: \"%s\"" => "DB Fehler: \"%s\"", "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"", "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.", -"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL", +"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits", -"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.", +"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php new file mode 100644 index 00000000000..8d5485a4a55 --- /dev/null +++ b/lib/l10n/my_MM.php @@ -0,0 +1,3 @@ + "Apps" +); diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 4b8ee76e762..42992855ecd 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -36,7 +36,7 @@ "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", "__language_name__" => "Deutsch (Persönlich)", "Security Warning" => "Sicherheitswarnung", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.", "Setup Warning" => "Einrichtungswarnung", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", @@ -45,14 +45,14 @@ "Locale not working" => "Ländereinstellung funktioniert nicht", "This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", -"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.", "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", "Enable Share API" => "Aktiviere Sharing-API", -"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Sharing-API", +"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API", "Allow links" => "Erlaube Links", "Allow users to share items to the public with links" => "Erlaube Benutzern Inhalte über öffentliche Links zu teilen", "Allow resharing" => "Erlaube erneutes teilen", @@ -64,7 +64,7 @@ "Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung", "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern", "Log" => "Log", -"Log level" => "Logtiefe", +"Log level" => "Loglevel", "More" => "Mehr", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Entwickelt von der ownCloud-Community, der Quellcode ist unter der AGPL lizenziert.", @@ -81,7 +81,7 @@ "Bugtracker" => "Bugtracker", "Commercial Support" => "Kommerzieller Support", "You have used %s of the available %s" => "Du verwendest %s der verfügbaren %s", -"Get the apps to sync your files" => "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter", +"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter", "Show First Run Wizard again" => "Erstinstallation erneut durchführen", "Password" => "Passwort", "Your password was changed" => "Dein Passwort wurde geändert.", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index ee235105360..5dd5001548e 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -43,16 +43,16 @@ "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "Locale not working" => "Lokalisierung funktioniert nicht", -"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", -"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.", "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", -"Enable Share API" => "Teilen-API aktivieren", -"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen", +"Enable Share API" => "Share-API aktivieren", +"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Share-API zu benutzen", "Allow links" => "Links erlauben", "Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen", "Allow resharing" => "Erlaube weiterverteilen", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index e0c20c6d97c..ec805cca3c6 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -34,6 +34,7 @@ "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", +"Sharing" => "Compartiendo", "More" => "Más", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Desarrollado por la comunidad ownCloud, el código fuente está bajo licencia AGPL.", diff --git a/settings/l10n/id.php b/settings/l10n/id.php index e62b3e15a7a..7f53a50b248 100644 --- a/settings/l10n/id.php +++ b/settings/l10n/id.php @@ -20,6 +20,7 @@ "Select an App" => "Pilih satu aplikasi", "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com", "Update" => "Pembaruan", +"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas anda", "Password" => "Password", "Unable to change your password" => "Tidak dapat merubah password anda", "Current password" => "Password saat ini", -- GitLab From c5e0dda8874244ac3c9acdf92bfd5e97405438c0 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 21 Feb 2013 11:09:00 +0100 Subject: [PATCH 115/353] add a safe_mode check --- lib/util.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/util.php b/lib/util.php index ab47e404c97..87facda1804 100755 --- a/lib/util.php +++ b/lib/util.php @@ -269,6 +269,11 @@ class OC_Util { 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } + if(ini_get('safe_mode')) { + $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.
    ', + 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); + $web_server_restart= false; + } $handler = ini_get("session.save_handler"); if($handler == "files") { -- GitLab From c24ec867f9e428dd90c021736c2d92c0516e3526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 12:20:29 +0100 Subject: [PATCH 116/353] calculate versions size per user --- apps/files_versions/appinfo/database.xml | 35 ++++++++++++++++ apps/files_versions/appinfo/version | 2 +- apps/files_versions/lib/versions.php | 53 ++++++++++++++++++++---- 3 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 apps/files_versions/appinfo/database.xml diff --git a/apps/files_versions/appinfo/database.xml b/apps/files_versions/appinfo/database.xml new file mode 100644 index 00000000000..7cfa5aa79af --- /dev/null +++ b/apps/files_versions/appinfo/database.xml @@ -0,0 +1,35 @@ + + + + *dbname* + true + false + + utf8 + + + + *dbprefix*files_versions + + + + + user + text + + true + 50 + + + size + text + + true + 50 + + + + +
    + +     diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version index e6d5cb833c6..e4c0d46e55f 100644 --- a/apps/files_versions/appinfo/version +++ b/apps/files_versions/appinfo/version @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.3 \ No newline at end of file diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index ba9f8ba41cb..415830a9a00 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -45,6 +45,37 @@ class Storage { return array($uid, $filename); } + /** + * get current size of all versions from a given user + * + * @param $user user who owns the versions + * @return mixed versions size or false if no versions size is stored + */ + private static function getVersionsSize($user) { + $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_versions WHERE user=?'); + $result = $query->execute(array($user))->fetchAll(); + + if ($result) { + return $result[0]['size']; + } + return false; + } + + /** + * write to the database how much space is in use for versions + * + * @param $user owner of the versions + * @param $size size of the versions + */ + private static function setVersionsSize($user, $size) { + if ( self::getVersionsSize($user) === false) { + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (size, user) VALUES (?, ?)'); + }else { + $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET size=? WHERE user=?'); + } + $query->execute(array($size, $user)); + } + /** * store a new version of a file. */ @@ -73,17 +104,19 @@ class Storage { } // store a new version of a file - $result = $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionSize < 0 ) { $versionsSize = self::calculateSize($uid); } + $versionsSize += $users_view->filesize('files'.$filename); - + // expire old revisions if necessary $newSize = self::expire($filename, $versionsSize); - + if ( $newSize != $versionsSize ) { - \OCP\Config::setAppValue('files_versions', 'size', $versionsSize); + self::setVersionsSize($uid, $newSize); } } } @@ -98,14 +131,15 @@ class Storage { $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v'; if( ($versions = self::getVersions($uid, $filename)) ) { - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionsSize < 0 ) { $versionsSize = self::calculateSize($uid); } foreach ($versions as $v) { unlink($abs_path . $v['version']); $versionsSize -= $v['size']; } - \OCP\Config::setAppValue('files_versions', 'size', $versionsSize); + self::setVersionsSize($uid, $versionsSize); } } @@ -314,12 +348,13 @@ class Storage { $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota')); } if ( $quota == null ) { - $quota = \OC\Files\Filesystem::free_space('/'); + $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); } // make sure that we have the current size of the version history if ( $versionsSize === null ) { - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionsSize < 0 ) { $versionsSize = self::calculateSize($uid); } } -- GitLab From 2436d01985311b3cd14c2f0dec745081ae7d3507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 12:37:13 +0100 Subject: [PATCH 117/353] calculate trashbin size per user --- apps/files_trashbin/appinfo/database.xml | 26 ++++++++++++ apps/files_trashbin/appinfo/version | 2 +- apps/files_trashbin/lib/trash.php | 52 ++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml index 1144a1c9a97..6f2a27866ff 100644 --- a/apps/files_trashbin/appinfo/database.xml +++ b/apps/files_trashbin/appinfo/database.xml @@ -89,4 +89,30 @@ + + + *dbprefix*files_trashsize + + + + + user + text + + true + 50 + + + + size + text + + true + 50 + + + + +
    + diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version index 49d59571fbf..be586341736 100644 --- a/apps/files_trashbin/appinfo/version +++ b/apps/files_trashbin/appinfo/version @@ -1 +1 @@ -0.1 +0.3 diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8d54a471b42..898f8972737 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -52,8 +52,9 @@ class Trashbin { } else { $type = 'file'; } - - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -89,7 +90,7 @@ class Trashbin { $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota')); } if ( $quota == null ) { - $quota = \OC\Files\Filesystem::free_space('/'); + $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); } // calculate available space for trash bin @@ -102,7 +103,8 @@ class Trashbin { } $trashbinSize -= self::expire($availableSpace); - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + + self::setTrashbinSize($user, $trashbinSize); } @@ -116,7 +118,8 @@ class Trashbin { $user = \OCP\User::getUser(); $view = new \OC_FilesystemView('/'.$user); - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -185,7 +188,8 @@ class Trashbin { $query->execute(array($user,$filename,$timestamp)); } - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + self::setTrashbinSize($user, $trashbinSize); + return true; } else { \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR); @@ -205,7 +209,8 @@ class Trashbin { $view = new \OC_FilesystemView('/'.$user); $size = 0; - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -242,7 +247,7 @@ class Trashbin { } $view->unlink('/files_trashbin/'.$file); $trashbinSize -= $size; - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + self::setTrashbinSize($user, $trashbinSize); return $size; } @@ -429,5 +434,36 @@ class Trashbin { } return $size; } + + /** + * get current size of trash bin from a given user + * + * @param $user user who owns the trash bin + * @return mixed trash bin size or false if no trash bin size is stored + */ + private static function getTrashbinSize($user) { + $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_trashsize WHERE user=?'); + $result = $query->execute(array($user))->fetchAll(); + + if ($result) { + return $result[0]['size']; + } + return false; + } + + /** + * write to the database how much space is in use for the trash bin + * + * @param $user owner of the trash bin + * @param $size size of the trash bin + */ + private static function setTrashbinSize($user, $size) { + if ( self::getTrashbinSize($user) === false) { + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (size, user) VALUES (?, ?)'); + }else { + $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET size=? WHERE user=?'); + } + $query->execute(array($size, $user)); + } } -- GitLab From 0a5457c5506730bf75a319b74a5bc97169da36d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 14:40:16 +0100 Subject: [PATCH 118/353] fix getVersions(), we need to get the correct user and filename --- apps/files_versions/ajax/getVersions.php | 4 ++-- apps/files_versions/lib/versions.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index 53fc04625c6..8a8fa43080c 100644 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -1,11 +1,11 @@ 604800), ); - private static function getUidAndFilename($filename) { + public static function getUidAndFilename($filename) { $uid = \OC\Files\Filesystem::getOwner($filename); if ( $uid != \OCP\User::getUser() ) { $info = \OC\Files\Filesystem::getFileInfo($filename); -- GitLab From eceb7341bb48edae49bec93f5df58f04c9eb99ab Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 21 Feb 2013 16:25:47 +0100 Subject: [PATCH 119/353] make number-input fields look like they should --- core/css/styles.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 8a01211d8b0..0c16b36873f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -36,8 +36,8 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC .header-right > * { vertical-align:middle; } /* INPUTS */ -input[type="text"], input[type="password"] { cursor:text; } -input[type="text"], input[type="password"], input[type="search"], +input[type="text"], input[type="password"], input[type="number"] { cursor:text; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea, select, button, .button, #quota, div.jp-progress, .pager li a { width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; font-family:Arial, Verdana, sans-serif; @@ -46,10 +46,11 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a { -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } input[type="hidden"] { height:0; width:0; } -input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; } -input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, +input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } @@ -196,7 +197,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #show, #personal-show { display:none; } #show + label { right:1em; top:1.25em!important; } #show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } -#show + label, #personal-show + label { +#show + label, #personal-show + label { position:absolute!important; height:14px; width:24px; background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; -- GitLab From 89ef06cd799a59f113a354a4fd0311d4e479fe36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 16:34:22 +0100 Subject: [PATCH 120/353] rename app to 'deleted files' --- apps/files_trashbin/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index e4217339602..7f807da579e 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -1,7 +1,7 @@ files_trashbin - Trash bin + Deleted files Keep a copy of deleted files so that they can be restored if needed AGPL Bjoern Schiessle -- GitLab From 859caee66a107b7e46f3d0bc615acfd112a2981d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 21 Feb 2013 16:52:18 +0100 Subject: [PATCH 121/353] use :hover pseudo class to set opacity --- apps/files/css/files.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index dfc2e4c0e2f..3cd809038b9 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -123,6 +123,24 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; } .selectedActions a img { position:relative; top:.3em; } +#fileList a.action { + display:none; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + opacity: 0; +} +#fileList tr:hover a.action { + display:inline; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)"; + filter: alpha(opacity=.5); + opacity: .5; +} +#fileList tr:hover a.action:hover { + display:inline; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; + filter: alpha(opacity=1); + opacity: 1; +} #scanning-message{ top:40%; left:40%; position:absolute; display:none; } -- GitLab From 0dd7fd0599e0757abc81677ccbb8d4a6839a5f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 21 Feb 2013 17:38:25 +0100 Subject: [PATCH 122/353] IE8 does not support window.onclick --- apps/files/js/files.js | 2 +- core/js/js.js | 2 +- search/js/result.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 8327460cca6..aeb7aedfaee 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -524,7 +524,7 @@ $(document).ready(function() { crumb.text(text); } - $(window).click(function(){ + $(document).click(function(){ $('#new>ul').hide(); $('#new').removeClass('active'); $('#new li').each(function(i,element){ diff --git a/core/js/js.js b/core/js/js.js index 6d5d65403fb..e373fca8865 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -669,7 +669,7 @@ $(document).ready(function(){ $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $(window).click(function(){//hide the settings menu when clicking outside it + $(document).click(function(){//hide the settings menu when clicking outside it $('#settings #expanddiv').slideUp(200); }); diff --git a/search/js/result.js b/search/js/result.js index cadb0d0aabe..78fa8efc8e9 100644 --- a/search/js/result.js +++ b/search/js/result.js @@ -28,7 +28,7 @@ OC.search.showResults=function(results){ OC.search.hide(); event.stopPropagation(); }); - $(window).click(function(event){ + $(document).click(function(event){ OC.search.hide(); }); OC.search.lastResults=results; -- GitLab From e7d1bbfae34afce54f7652c815aed7a269d1160e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Feb 2013 18:20:14 +0100 Subject: [PATCH 123/353] fix giant advanced caret in installation --- core/img/actions/caret-dark.png | Bin 0 -> 256 bytes core/img/actions/caret-dark.svg | 102 ++++++++++++++++++++++++++++++++ core/templates/installation.php | 2 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 core/img/actions/caret-dark.png create mode 100644 core/img/actions/caret-dark.svg diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ce7e1e6980298b86b6eb5bbf9008ea7dfb67699f GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5m^jW ze;tGwoit`w00kvWTq8(3{0JJ<;>(%z3q(K9nDUfavC`*#6aC7@ ucWthV%HO>3fAYD?)ema8nY^Qq^8MFhS8 + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/core/templates/installation.php b/core/templates/installation.php index b3b7cfc4b8b..9cb1d4600d5 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -49,7 +49,7 @@
    - t( 'Advanced' ); ?> + t( 'Advanced' ); ?>
    -- GitLab From 88bea55f9736bc0ddd1da5a2e055bd6b3494f73b Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 21 Feb 2013 21:30:25 +0100 Subject: [PATCH 124/353] Update hint by the internal version number. So we don't repeat the 4.5 <=> 4.90 mixup --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 5d3286204e4..ab47e404c97 100755 --- a/lib/util.php +++ b/lib/util.php @@ -73,8 +73,8 @@ class OC_Util { * @return array */ public static function getVersion() { - // hint: We only can count up. So the internal version number - // of ownCloud 4.5 will be 4.90.0. This is not visible to the user + // hint: We only can count up. Reset minor/patchlevel when + // updating major/minor version number. return array(4, 93, 10); } -- GitLab From 629097bee73d70af002a5277529a7afdca75897d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 22:44:44 +0100 Subject: [PATCH 125/353] increase db fileds for usernames --- apps/files_trashbin/appinfo/database.xml | 4 ++-- apps/files_versions/appinfo/database.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml index 6f2a27866ff..6f12b26d052 100644 --- a/apps/files_trashbin/appinfo/database.xml +++ b/apps/files_trashbin/appinfo/database.xml @@ -26,7 +26,7 @@ text true - 50 + 64 @@ -100,7 +100,7 @@ text true - 50 + 64 diff --git a/apps/files_versions/appinfo/database.xml b/apps/files_versions/appinfo/database.xml index 7cfa5aa79af..d3854776980 100644 --- a/apps/files_versions/appinfo/database.xml +++ b/apps/files_versions/appinfo/database.xml @@ -18,7 +18,7 @@ text true - 50 + 64 size -- GitLab From 59a3238d1a0494987546b5ecc14622981b4a2778 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 14 Feb 2013 22:37:49 +0100 Subject: [PATCH 126/353] Style cleanup files_sharing --- apps/files_sharing/appinfo/update.php | 5 ++++- apps/files_sharing/lib/cache.php | 5 +++-- apps/files_sharing/lib/permissions.php | 3 ++- apps/files_sharing/lib/share/file.php | 14 ++++++++++++-- apps/files_sharing/lib/share/folder.php | 5 +++-- apps/files_sharing/lib/sharedstorage.php | 10 +++++++--- apps/files_sharing/public.php | 7 +++++-- apps/files_sharing/templates/public.php | 20 ++++++++++++++------ 8 files changed, 50 insertions(+), 19 deletions(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 1d22b32b503..48e41e93048 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) { } catch (Exception $e) { $update_error = true; - OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN); + OCP\Util::writeLog('files_sharing', + 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith + .'" (error is "'.$e->getMessage().'")', + OCP\Util::WARN); } OC_Util::tearDownFS(); } diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 9655e447875..fb0f6c7b5a6 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -71,8 +71,9 @@ class Shared_Cache extends Cache { } } else { $query = \OC_DB::prepare( - 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` - FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,' + .' `size`, `mtime`, `encrypted`' + .' FROM `*PREFIX*filecache` WHERE `fileid` = ?'); $result = $query->execute(array($file)); $data = $result->fetchRow(); $data['fileid'] = (int)$data['fileid']; diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php index 2b068ff9350..72c1ec96c46 100644 --- a/apps/files_sharing/lib/permissions.php +++ b/apps/files_sharing/lib/permissions.php @@ -33,7 +33,8 @@ class Shared_Permissions extends Permissions { if ($fileId == -1) { return \OCP\PERMISSION_READ; } - $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, null, true); + $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, + null, true); if ($source) { return $source['permissions']; } else { diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 6d3c55a008f..0aeb763d89a 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -72,7 +72,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { public function formatItems($items, $format, $parameters = null) { if ($format == self::FORMAT_SHARED_STORAGE) { // Only 1 item should come through for this format call - return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']); + return array( + 'path' => $items[key($items)]['path'], + 'permissions' => $items[key($items)]['permissions'], + 'uid_owner' => $items[key($items)]['uid_owner'] + ); } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) { $files = array(); foreach ($items as $item) { @@ -99,7 +103,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { } $size += (int)$item['size']; } - return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size); + return array( + 'fileid' => -1, + 'name' => 'Shared', + 'mtime' => $mtime, + 'mimetype' => 'httpd/unix-directory', + 'size' => $size + ); } else if ($format == self::FORMAT_OPENDIR) { $files = array(); foreach ($items as $item) { diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index 11c8c6b1e80..4426beec636 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share } while (!empty($parents)) { $parents = "'".implode("','", $parents)."'"; - $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')'); + $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`' + .' WHERE `parent` IN ('.$parents.')'); $result = $query->execute(); $parents = array(); while ($file = $result->fetchRow()) { @@ -47,4 +48,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share return $children; } -} \ No newline at end of file +} diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 65812b7e2fd..c7521949da1 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -240,7 +240,8 @@ class Shared extends \OC\Files\Storage\Common { public function file_put_contents($path, $data) { if ($source = $this->getSourcePath($path)) { // Check if permission is granted - if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) { + if (($this->file_exists($path) && !$this->isUpdatable($path)) + || ($this->is_dir($path) && !$this->isCreatable($path))) { return false; } $info = array( @@ -390,9 +391,12 @@ class Shared extends \OC\Files\Storage\Common { } public static function setup($options) { - if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) { + if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] + || \OCP\Share::getItemsSharedWith('file')) { $user_dir = $options['user_dir']; - \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/'); + \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', + array('sharedFolder' => '/Shared'), + $user_dir.'/Shared/'); } } diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 38d598f7780..f265a7dd014 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -171,7 +171,9 @@ if (isset($path)) { $list->assign('files', $files, false); $list->assign('disableSharing', true); $list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false); - $list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false); + $list->assign('downloadURL', + OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', + false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false); @@ -188,7 +190,8 @@ if (isset($path)) { $folder->assign('usedSpacePercent', 0); $tmpl->assign('folder', $folder->fetchPage(), false); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath)); + $tmpl->assign('downloadURL', + OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath)); } else { $tmpl->assign('dir', $dir); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 7776fd63b3c..f9ff12679bc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -3,15 +3,20 @@
    @@ -27,9 +32,12 @@
    -

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

    +

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

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

    '; + echo ' Revert

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

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

    -

    -

    -

    +

    +

    +

    +

    +

    +

    +

    -

    + data-default="" + title="t('For anonymous access, leave DN and Password empty.'));?>" />

    +

    -
    t('use %%uid placeholder, e.g. "uid=%%uid"');?>

    -

    + data-default="" + title="t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.'));?>" /> +
    t('use %%uid placeholder, e.g. "uid=%%uid"'));?>

    +

    -
    t('without any placeholder, e.g. "objectClass=person".');?>

    -

    + data-default="" + title="t('Defines the filter to apply, when retrieving users.'));?>" /> +
    t('without any placeholder, e.g. "objectClass=person".'));?>

    +

    -
    t('without any placeholder, e.g. "objectClass=posixGroup".');?>

    + data-default="" + title="t('Defines the filter to apply, when retrieving groups.'));?>" /> +
    t('without any placeholder, e.g. "objectClass=posixGroup".'));?>

    -

    t('Connection Settings');?>

    +

    t('Connection Settings'));?>

    -

    -

    -

    -

    -

    -

    -

    >

    -


    t('Not recommended, use for testing only.');?>

    -

    +

    +

    +

    +

    +

    +

    +

    >

    +


    t('Not recommended, use for testing only.'));?>

    +

    -

    t('Directory Settings');?>

    +

    t('Directory Settings'));?>

    -

    -

    -

    -

    -

    -

    -

    +

    +

    +

    +

    +

    +

    +

    -

    t('Special Attributes');?>

    +

    t('Special Attributes'));?>

    -

    -

    -

    -

    +

    +

    +

    +

    - t('Help');?> + t('Help'));?> -- GitLab From 0b5b4955357753e63ab1a88a04341836c37c24ae Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 27 Feb 2013 22:06:50 +0100 Subject: [PATCH 236/353] [user_webdavauth] From echo to p --- apps/user_webdavauth/templates/settings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php index 45f4d81aecf..ec6524ee4f7 100755 --- a/apps/user_webdavauth/templates/settings.php +++ b/apps/user_webdavauth/templates/settings.php @@ -1,9 +1,9 @@
    - t('WebDAV Authentication');?> -

    - + t('WebDAV Authentication'));?> +

    + -
    t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.'); ?> +
    t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>

    -- GitLab From d7528f06dfd8eb0576bd2cee5ae4230ffb5b5066 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 26 Feb 2013 22:41:05 +0100 Subject: [PATCH 237/353] Disable query cache for Sqlite --- lib/db.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/db.php b/lib/db.php index 1fd852b370f..347deac8519 100644 --- a/lib/db.php +++ b/lib/db.php @@ -384,7 +384,10 @@ class OC_DB { $result=new PDOStatementWrapper($result); } if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) { - self::$preparedQueries[$rawQuery] = $result; + $type = OC_Config::getValue( "dbtype", "sqlite" ); + if( $type != 'sqlite' && $type != 'sqlite3' ) { + self::$preparedQueries[$rawQuery] = $result; + } } return $result; } -- GitLab From 40e51d13d2fd028fa13902b12814532d1de15f5a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 27 Feb 2013 22:35:37 +0100 Subject: [PATCH 238/353] Remove uneeded file --- core/templates/exception.php | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 core/templates/exception.php diff --git a/core/templates/exception.php b/core/templates/exception.php deleted file mode 100644 index 4059c7e047d..00000000000 --- a/core/templates/exception.php +++ /dev/null @@ -1,32 +0,0 @@ -
      -
    • -
      - We're sorry, but something went terribly wrong.
       -

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

      '; - } else { - echo 'Your administrator has disabled systeminformations.'; - } - ?> -

      -
      -
      • -
    -- GitLab From 229c907a57a4a64730e7b58f59cb8f7f627bfaf3 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 27 Feb 2013 22:55:39 +0100 Subject: [PATCH 239/353] [core] From echo to p --- core/templates/403.php | 4 +- core/templates/404.php | 4 +- core/templates/edit_categories_dialog.php | 6 +- core/templates/error.php | 4 +- core/templates/installation.php | 82 +++++++------- core/templates/layout.base.php | 16 +-- core/templates/layout.guest.php | 20 ++-- core/templates/layout.user.php | 52 ++++----- core/templates/login.php | 32 +++--- core/templates/part.pagenavi.php | 8 +- core/templates/update.php | 4 +- lib/setup.php | 2 +- lib/template.php | 6 +- lib/templatelayout.php | 10 +- settings/apps.php | 2 +- settings/templates/admin.php | 118 ++++++++++----------- settings/templates/apps.php | 28 ++--- settings/templates/help.php | 18 ++-- settings/templates/oauth-required-apps.php | 6 +- settings/templates/oauth.php | 4 +- settings/templates/personal.php | 68 ++++++------ settings/templates/settings.php | 2 +- settings/templates/users.php | 108 +++++++++---------- 23 files changed, 302 insertions(+), 302 deletions(-) diff --git a/core/templates/403.php b/core/templates/403.php index fbf0e64fdb6..6e910fd2e82 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page ?>
    • - t( 'Access forbidden' ); ?>
      -

      + t( 'Access forbidden' )); ?>
      +

    diff --git a/core/templates/404.php b/core/templates/404.php index c111fd70fa9..ee17f0de8e1 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page ?>
    • - t( 'Cloud not found' ); ?>
      -

      + t( 'Cloud not found' )); ?>
      +

    diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php index d0b7b5ee62a..ea155bdf0ba 100644 --- a/core/templates/edit_categories_dialog.php +++ b/core/templates/edit_categories_dialog.php @@ -1,19 +1,19 @@ -
    +
      -
      • +
    - +
    diff --git a/core/templates/error.php b/core/templates/error.php index 4f05e008f99..3305f3fba9c 100644 --- a/core/templates/error.php +++ b/core/templates/error.php @@ -1,8 +1,8 @@
    • -
      -

      +
      +

    diff --git a/core/templates/installation.php b/core/templates/installation.php index aca9648d0bf..f8c91e37eb4 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,8 +1,8 @@ -'> -'> -'> -'> -'> +'> +'> +'> +'> +'>
    0): ?> @@ -10,10 +10,10 @@
  • - -

    + +

    - +
    • @@ -21,54 +21,54 @@
    - t('Security Warning');?> -

    t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?>
    - t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?>

    + t('Security Warning'));?> +

    t('No secure random number generator is available, please enable the PHP OpenSSL extension.'));?>
    + t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.'));?>

    - t('Security Warning');?> -

    t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.');?>
    - t('For information how to properly configure your server, please see the documentation.');?>

    + t('Security Warning'));?> +

    t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?>
    + t('For information how to properly configure your server, please see the documentation.'));?>

    - t( 'Create an admin account' ); ?> + t( 'Create an admin account' )); ?>

    - - + value="" autocomplete="off" autofocus required /> + +

    - - + value="" /> + +

    - t( 'Advanced' ); ?> + t( 'Advanced' )); ?>
    - + + value="" />
    - t( 'Configure the database' ); ?> + t( 'Configure the database' ); ?>
    -

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

    +

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

    -

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

    +

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

    -

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

    +

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

    @@ -102,7 +102,7 @@ -

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

    +

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

    @@ -114,7 +114,7 @@ -

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

    +

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

    @@ -126,19 +126,19 @@

    - + + value="" autocomplete="off" />

    - + + value="" />

    - +

    @@ -146,18 +146,18 @@

    - + + value="" autocomplete="off" />

    - + + value="" />

    -
    +
    diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 47d552069a0..0ada957478e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -3,26 +3,26 @@ ownCloud - - + + - + - + $value) { - echo "$name='$value' "; + print_unescaped("$name='$value' "); }; - echo '/>'; + print_unescaped('/>)'; ?> - + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index a84e2b8cef7..03d58c9eae1 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,22 +4,22 @@ ownCloud - - + + - + - + $value) { - echo "$name='$value' "; + print_unescaped("$name='$value' "); }; - echo '/>'; + print_unescaped('/>'); ?> @@ -27,11 +27,11 @@
    - +

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

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

    diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 10540cfe362..2b53cc0ae5d 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,56 +1,56 @@ - <?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud - <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?> + <?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud + <?php p(!empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'') ?> - - + + - + - + $value) { - echo "$name='$value' "; + print_unescaped("$name='$value' "); }; - echo '/>'; + print_unescaped('/>'); ?> - +
    @@ -66,11 +66,11 @@